diff options
| author | Weston Andros Adamson <dros@primarydata.com> | 2014-08-08 11:00:56 -0400 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-08-22 18:04:43 -0400 |
| commit | 94970014c46223cbcdfbfc67b89596a412f9e3dd (patch) | |
| tree | 1bb2e91e8cde9558d67f18a6d84e8eb7abb11545 | |
| parent | bfd484a5606d6a0379a0a2f04251b1e5c1f8995c (diff) | |
| download | linux-94970014c46223cbcdfbfc67b89596a412f9e3dd.tar.gz | |
nfs: fix error handling in lock_and_join_requests
This fixes handling of errors from nfs_page_group_lock in nfs_lock_and_join_requests. It now releases the inode lock and the reference to the head request. Reported-by: Peng Tao <tao.peng@primarydata.com> Signed-off-by: Weston Andros Adamson <dros@primarydata.com> Reviewed-by: Peng Tao <tao.peng@primarydata.com> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
| -rw-r--r-- | fs/nfs/write.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 27715306f24b..e056f617adf2 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -480,8 +480,11 @@ try_again: /* lock each request in the page group */ ret = nfs_page_group_lock(head, true); - if (ret < 0) + if (ret < 0) { + spin_unlock(&inode->i_lock); + nfs_release_request(head); return ERR_PTR(ret); + } subreq = head; do { /* |