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 <[email protected]> Signed-off-by: Weston Andros Adamson <[email protected]> Reviewed-by: Peng Tao <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
makiko-fly · Aug 22, 2014 · 9497001 · 9497001
1 parent bfd484a
commit 9497001
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
@@ -480,8 +480,11 @@ nfs_lock_and_join_requests(struct page *page, bool nonblock)
 
 	/* 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 {
 		/*