From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Tue, 3 Jan 2006 08:55:58 +0000 (+0100)
Subject: NFSv4: Fix an Oops in nfs_do_expire_all_delegations
X-Git-Tag: v2.6.16-rc1~935^2~4^2~3
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=26c78e156b1d1b2387ec33b5f2fb62d6e0a186a3;p=linux-2.6-omap-h63xx.git

NFSv4: Fix an Oops in nfs_do_expire_all_delegations

 If the loop errors, we need to exit.

 Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c
index 66cc720e392..c6f07c1c71e 100644
--- a/fs/nfs/delegation.c
+++ b/fs/nfs/delegation.c
@@ -236,7 +236,6 @@ int nfs_do_expire_all_delegations(void *ptr)
 	struct nfs4_client *clp = ptr;
 	struct nfs_delegation *delegation;
 	struct inode *inode;
-	int err = 0;
 
 	allow_signal(SIGKILL);
 restart:
@@ -250,10 +249,9 @@ restart:
 		if (inode == NULL)
 			continue;
 		spin_unlock(&clp->cl_lock);
-		err = nfs_inode_return_delegation(inode);
+		nfs_inode_return_delegation(inode);
 		iput(inode);
-		if (!err)
-			goto restart;
+		goto restart;
 	}
 out:
 	spin_unlock(&clp->cl_lock);