leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NFS: Ensure that we break out of read/write_schedule_segment on error

Browse Source 
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>
This commit is contained in:
Trond Myklebust 2012-04-30 13:22:54 -04:00
parent 68cd6fa4f3
commit 71e8cc00c6
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/nfs/direct.c
View File

@ -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);