From 245c09eb4f2d44d71582fe287b22edb343587f20 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Mon, 30 Apr 2012 13:22:54 -0400 Subject: [PATCH] --- yaml --- r: 308564 b: refs/heads/master c: 71e8cc00c63e8518ce86b4079355fc9086a4869d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/nfs/direct.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7a7fdb98bbcf..ff6175c9ff35 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 68cd6fa4f3be07ba648e22617dfa16a40d671d19 +refs/heads/master: 71e8cc00c63e8518ce86b4079355fc9086a4869d diff --git a/trunk/fs/nfs/direct.c b/trunk/fs/nfs/direct.c index e83545c4d36f..f30d5c26a763 100644 --- a/trunk/fs/nfs/direct.c +++ b/trunk/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);