Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 346623
b: refs/heads/master
c: 67fad10
h: refs/heads/master
i:
  346621: 4884134
  346619: 8a074ed
  346615: 472f515
  346607: 608ddbc
  346591: afe2767
  346559: 23d1d70
  346495: 8fe7baf
  346367: 610e5ca
  346111: d15aff1
v: v3
  • Loading branch information
Jeff Layton authored and Trond Myklebust committed Dec 12, 2012
1 parent dd5f456 commit ba53838
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b0ef9647a0cd6cfd63fed48fbbe6005e4ba92571
refs/heads/master: 67fad106a219e083c91c79695bd1807dde1bf7b9
8 changes: 0 additions & 8 deletions trunk/fs/nfs/direct.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit ba53838

Please sign in to comment.