Commit fd94619c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'zonefs-6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs 

Pull zonefs update from Damien Le Moal:

 - Some comment spelling fixes (Xichao)

* tag 'zonefs-6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs:
  zonefs: correct some spelling mistakes
parents 4b616669 a42938e8

fs/zonefs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static int zonefs_write_iomap_begin(struct inode *inode, loff_t offset, 
	/*

	 * For conventional zones, all blocks are always mapped. For sequential

	 * zones, all blocks after always mapped below the inode size (zone

	 * write pointer) and unwriten beyond.

	 * write pointer) and unwritten beyond.

	 */

	mutex_lock(&zi->i_truncate_mutex);

	iomap->bdev = inode->i_sb->s_bdev;

fs/zonefs/super.c

+2 −2
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ static void zonefs_handle_io_error(struct inode *inode, struct blk_zone *zone, 
	 * Check the zone condition: if the zone is not "bad" (offline or

	 * read-only), read errors are simply signaled to the IO issuer as long

	 * as there is no inconsistency between the inode size and the amount of

	 * data writen in the zone (data_size).

	 * data written in the zone (data_size).

	 */

	data_size = zonefs_check_zone_condition(sb, z, zone);

	isize = i_size_read(inode);
@@ -282,7 +282,7 @@ static void zonefs_handle_io_error(struct inode *inode, struct blk_zone *zone, 
	 * For the latter case, the cause may be a write IO error or an external

	 * action on the device. Two error patterns exist:

	 * 1) The inode size is lower than the amount of data in the zone:

	 *    a write operation partially failed and data was writen at the end

	 *    a write operation partially failed and data was written at the end

	 *    of the file. This can happen in the case of a large direct IO

	 *    needing several BIOs and/or write requests to be processed.

	 * 2) The inode size is larger than the amount of data in the zone: