From: Shaohua Li <shli@fb.com>
To: <linux-block@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Cc: <kernel-team@fb.com>, Christoph Hellwig <hch@lst.de>,
Jens Axboe <axboe@fb.com>
Subject: [PATCH] block_dev: don't update file access position for sync direct IO
Date: Tue, 13 Dec 2016 19:07:55 -0800 [thread overview]
Message-ID: <d78aaba0928aa012d13eb462bbfc33cdddd0621a.1481684697.git.shli@fb.com> (raw)
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>
---
fs/block_dev.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/fs/block_dev.c b/fs/block_dev.c
index 95acbd2..1eb7dcf 100644
--- 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;
--
2.9.3
next reply other threads:[~2016-12-14 3:08 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-14 3:07 Shaohua Li [this message]
2016-12-14 4:08 ` Jens Axboe
2016-12-14 10:20 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d78aaba0928aa012d13eb462bbfc33cdddd0621a.1481684697.git.shli@fb.com \
--to=shli@fb.com \
--cc=axboe@fb.com \
--cc=hch@lst.de \
--cc=kernel-team@fb.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®