diff options
| author | Jeff Layton <jlayton@redhat.com> | 2012-12-12 12:36:31 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-12-12 12:56:19 -0500 |
| commit | be7e985804c610fcdcee8730cf42718b8a4e1c41 (patch) | |
| tree | 37facb834c1269ca07d39f59ed4db603a02222ea | |
| parent | 67fad106a219e083c91c79695bd1807dde1bf7b9 (diff) | |
| download | blackbird-obmc-linux-be7e985804c610fcdcee8730cf42718b8a4e1c41.tar.gz blackbird-obmc-linux-be7e985804c610fcdcee8730cf42718b8a4e1c41.zip | |
nfs: fix page dirtying in NFS DIO read codepath
The NFS DIO code will dirty pages that catch read responses in order to
handle the case where someone is doing DIO reads into an mmapped buffer.
The existing code doesn't really do the right thing though since it
doesn't take into account the case where we might be attempting to read
past the EOF.
Fix the logic in that code to only dirty pages that ended up receiving
data from the read. Note too that it really doesn't matter if
NFS_IOHDR_ERROR is set or not. All that matters is if the page was
altered by the read.
Cc: Fred Isaman <iisaman@netapp.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
| -rw-r--r-- | fs/nfs/direct.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 594f4e7e0b9a..0bd7a55a5f07 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -266,13 +266,8 @@ static void nfs_direct_read_completion(struct nfs_pgio_header *hdr) struct nfs_page *req = nfs_list_entry(hdr->pages.next); struct page *page = req->wb_page; - if (!PageCompound(page)) { - if (test_bit(NFS_IOHDR_ERROR, &hdr->flags)) { - if (bytes < hdr->good_bytes) - set_page_dirty(page); - } else - set_page_dirty(page); - } + if (!PageCompound(page) && bytes < hdr->good_bytes) + set_page_dirty(page); bytes += req->wb_bytes; nfs_list_remove_request(req); nfs_direct_readpage_release(req); |
