diff options
| author | Linus Torvalds | 2023-03-23 11:05:08 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2023-03-23 11:05:08 -0700 |
| commit | 9fd6ba5420ba2b637d1ecc6de8613ec8b9c87e5a (patch) | |
| tree | d91c5445c5bbd263418467af2801b8081f2ee306 | |
| parent | fff5a5e7f528b2ed2c335991399a766c2cf01103 (diff) | |
| parent | 88b170088ad2c3e27086fe35769aa49f8a512564 (diff) | |
Merge tag 'zonefs-6.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs
Pull zonefs fixes from Damien Le Moal:
- Silence a false positive smatch warning about an uninitialized
variable
- Fix an error message to provide more useful information about invalid
zone append write results
* tag 'zonefs-6.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs:
zonefs: Fix error message in zonefs_file_dio_append()
zonefs: Prevent uninitialized symbol 'size' warning
| -rw-r--r-- | fs/zonefs/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/zonefs/file.c b/fs/zonefs/file.c index 738b0e28d74b..617e4f9db42e 100644 --- a/fs/zonefs/file.c +++ b/fs/zonefs/file.c @@ -383,7 +383,7 @@ static ssize_t zonefs_file_dio_append(struct kiocb *iocb, struct iov_iter *from) struct block_device *bdev = inode->i_sb->s_bdev; unsigned int max = bdev_max_zone_append_sectors(bdev); struct bio *bio; - ssize_t size; + ssize_t size = 0; int nr_pages; ssize_t ret; @@ -426,7 +426,7 @@ static ssize_t zonefs_file_dio_append(struct kiocb *iocb, struct iov_iter *from) if (bio->bi_iter.bi_sector != wpsector) { zonefs_warn(inode->i_sb, "Corrupted write pointer %llu for zone at %llu\n", - wpsector, z->z_sector); + bio->bi_iter.bi_sector, z->z_sector); ret = -EIO; } } |