From ba5383829df44978c396d8c5300c2f8dc931e463 Mon Sep 17 00:00:00 2001 From: Jeff Layton Date: Wed, 12 Dec 2012 11:38:44 -0500 Subject: [PATCH] --- yaml --- r: 346623 b: refs/heads/master c: 67fad106a219e083c91c79695bd1807dde1bf7b9 h: refs/heads/master i: 346621: 488413413f10e5b6cc92abfd667702fcb8a690e9 346619: 8a074edb69f38e99633001aa28d7bc07ad611912 346615: 472f515ded219ccab8a39cc54df78d798981756a 346607: 608ddbc289ade05f89319d3be843f92d43f6c0ee 346591: afe276771bb4f51e20f5c37ce07ba55d1a03f47f 346559: 23d1d708ac770158eedc555f92dba9d8c047cc39 346495: 8fe7baf35e4f3852ab658057c6bcc126244bb16f 346367: 610e5ca914b176101103024fed696a65b7d85de2 346111: d15aff18d8d0cc2de217a2b2cea0e1a38dcb9ec8 v: v3 --- [refs] | 2 +- trunk/fs/nfs/direct.c | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 1dde0fcd25da..a33370ac43ce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b0ef9647a0cd6cfd63fed48fbbe6005e4ba92571 +refs/heads/master: 67fad106a219e083c91c79695bd1807dde1bf7b9 diff --git a/trunk/fs/nfs/direct.c b/trunk/fs/nfs/direct.c index cae26cbd59ee..594f4e7e0b9a 100644 --- a/trunk/fs/nfs/direct.c +++ b/trunk/fs/nfs/direct.c @@ -266,14 +266,6 @@ 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 (test_bit(NFS_IOHDR_EOF, &hdr->flags)) { - if (bytes > hdr->good_bytes) - zero_user(page, 0, PAGE_SIZE); - else if (hdr->good_bytes - bytes < PAGE_SIZE) - zero_user_segment(page, - hdr->good_bytes & ~PAGE_MASK, - PAGE_SIZE); - } if (!PageCompound(page)) { if (test_bit(NFS_IOHDR_ERROR, &hdr->flags)) { if (bytes < hdr->good_bytes)