From: Trond Myklebust Date: Mon, 30 Apr 2012 17:22:54 +0000 (-0400) Subject: NFS: Ensure that we break out of read/write_schedule_segment on error X-Git-Tag: v3.5-rc1~52^2~111 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=71e8cc00c63e8518ce86b4079355fc9086a4869d;p=~emulex%2Finfiniband.git 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 Cc: Fred Isaman --- diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index e83545c4d36..f30d5c26a76 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);