Commit 9fd6ba54 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents fff5a5e7 88b17008

fs/zonefs/file.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

		}

	}