diff --git a/[refs] b/[refs] index a33370ac43ce..53a05e96ce11 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 67fad106a219e083c91c79695bd1807dde1bf7b9 +refs/heads/master: be7e985804c610fcdcee8730cf42718b8a4e1c41 diff --git a/trunk/fs/nfs/direct.c b/trunk/fs/nfs/direct.c index 594f4e7e0b9a..0bd7a55a5f07 100644 --- a/trunk/fs/nfs/direct.c +++ b/trunk/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);