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>

diff --git a/fs/block_dev.c b/fs/block_dev.c
index d4f23353ee4d6b8211d36c1dd33227bf93045c01..7c4507224ed66b876b5bf01fd45a6d6da8106308 100644 (file)
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -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;