Commit 7a62a523 authored Dec 13, 2016 by Shaohua Li Committed by Jens Axboe Dec 13, 2016

block_dev: don't update file access position for sync direct IO

For sync direct IO, generic_file_direct_write/generic_file_read_iter
will update file access position. Don't duplicate the update in
.direct_IO. This cause my raid array can't assemble.

Cc: Christoph Hellwig <hch@lst.de>
Cc: Jens Axboe <axboe@fb.com>
Signed-off-by: Shaohua Li <shli@fb.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

parent d2a61918

fs/block_dev.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -264,7 +264,6 @@ __blkdev_direct_IO_simple(struct kiocb iocb, struct iov_iter iter,

		if (unlikely(bio.bi_error))
		return bio.bi_error;
		iocb->ki_pos += ret;
		return ret;
		}

		@@ -411,10 +410,8 @@ __blkdev_direct_IO(struct kiocb iocb, struct iov_iter iter, int nr_pages)
		__set_current_state(TASK_RUNNING);

		ret = dio->bio.bi_error;
		if (likely(!ret)) {
		if (likely(!ret))
		ret = dio->size;
		iocb->ki_pos += ret;
		}

		bio_put(&dio->bio);
		return ret;