summaryrefslogtreecommitdiff
path: root/fs/nfs/direct.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2012-04-30 21:22:54 +0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-04-30 22:33:51 +0400
commit71e8cc00c63e8518ce86b4079355fc9086a4869d (patch)
treec48dd887cbb8e3228652992acbfc558a1a066f0e /fs/nfs/direct.c
parent68cd6fa4f3be07ba648e22617dfa16a40d671d19 (diff)
downloadlinux-71e8cc00c63e8518ce86b4079355fc9086a4869d.tar.xz
NFS: Ensure that we break out of read/write_schedule_segment on error
Currently we do break out of the for() loop, but we also need to break out of the enclosing do {} while()... Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> Cc: Fred Isaman <iisaman@netapp.com>
Diffstat (limited to 'fs/nfs/direct.c')
-rw-r--r--fs/nfs/direct.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index e83545c4d36f..f30d5c26a763 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -396,7 +396,7 @@ static ssize_t nfs_direct_read_schedule_segment(struct nfs_pageio_descriptor *de
pos += req_len;
count -= req_len;
}
- } while (count != 0);
+ } while (count != 0 && result >= 0);
kfree(pagevec);
@@ -692,6 +692,7 @@ static ssize_t nfs_direct_write_schedule_segment(struct nfs_pageio_descriptor *d
nfs_release_request(req);
nfs_direct_release_pages(pagevec + i,
npages - i);
+ break;
}
pgbase = 0;
bytes -= req_len;
@@ -700,7 +701,7 @@ static ssize_t nfs_direct_write_schedule_segment(struct nfs_pageio_descriptor *d
pos += req_len;
count -= req_len;
}
- } while (count != 0);
+ } while (count != 0 && result >= 0);
kfree(pagevec);