Commit 936e114a authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Andrew Morton
Browse files

iomap: update ki_pos a little later in iomap_dio_complete 

Move the ki_pos update down a bit to prepare for a better common helper
that invalidates pages based of an iocb.

Link: https://lkml.kernel.org/r/20230601145904.1385409-3-hch@lst.de


Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Andreas Gruenbacher <agruenba@redhat.com>
Cc: Anna Schumaker <anna@kernel.org>
Cc: Chao Yu <chao@kernel.org>
Cc: Christian Brauner <brauner@kernel.org>
Cc: Ilya Dryomov <idryomov@gmail.com>
Cc: Jaegeuk Kim <jaegeuk@kernel.org>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Miklos Szeredi <miklos@szeredi.hu>
Cc: Miklos Szeredi <mszeredi@redhat.com>
Cc: Theodore Ts'o <tytso@mit.edu>
Cc: Trond Myklebust <trond.myklebust@hammerspace.com>
Cc: Xiubo Li <xiubli@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 0d625446

fs/iomap/direct-io.c

+11 −10
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ ssize_t iomap_dio_complete(struct iomap_dio *dio) 
		if (offset + ret > dio->i_size &&

		    !(dio->flags & IOMAP_DIO_WRITE))

			ret = dio->i_size - offset;

		iocb->ki_pos += ret;

	}



	/*
@@ -120,19 +119,21 @@ ssize_t iomap_dio_complete(struct iomap_dio *dio) 
	}



	inode_dio_end(file_inode(iocb->ki_filp));



	if (ret > 0) {

		iocb->ki_pos += ret;



		/*

	 * If this is a DSYNC write, make sure we push it to stable storage now

	 * that we've written data.

		 * If this is a DSYNC write, make sure we push it to stable

		 * storage now that we've written data.

		 */

	if (ret > 0 && (dio->flags & IOMAP_DIO_NEED_SYNC))

		if (dio->flags & IOMAP_DIO_NEED_SYNC)

			ret = generic_write_sync(iocb, ret);



		if (ret > 0)

			ret += dio->done_before;



	}

	trace_iomap_dio_complete(iocb, dio->error, ret);

	kfree(dio);



	return ret;

}

EXPORT_SYMBOL_GPL(iomap_dio_complete);