Skip to content

Commit 9fd6ba5

Browse files
committed
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
2 parents fff5a5e + 88b1700 commit 9fd6ba5

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

fs/zonefs/file.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ static ssize_t zonefs_file_dio_append(struct kiocb *iocb, struct iov_iter *from)
383383
struct block_device *bdev = inode->i_sb->s_bdev;
384384
unsigned int max = bdev_max_zone_append_sectors(bdev);
385385
struct bio *bio;
386-
ssize_t size;
386+
ssize_t size = 0;
387387
int nr_pages;
388388
ssize_t ret;
389389

@@ -426,7 +426,7 @@ static ssize_t zonefs_file_dio_append(struct kiocb *iocb, struct iov_iter *from)
426426
if (bio->bi_iter.bi_sector != wpsector) {
427427
zonefs_warn(inode->i_sb,
428428
"Corrupted write pointer %llu for zone at %llu\n",
429-
wpsector, z->z_sector);
429+
bio->bi_iter.bi_sector, z->z_sector);
430430
ret = -EIO;
431431
}
432432
}

0 commit comments

Comments
 (0)