From 156f6ec26e2ae48b3333f079629f434f49fc99af Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Tue, 3 Jan 2006 09:55:58 +0100
Subject: [PATCH] --- yaml --- r: 16650 b: refs/heads/master c:
 26c78e156b1d1b2387ec33b5f2fb62d6e0a186a3 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/fs/nfs/delegation.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 5bda3e4caf6f..320f9ceda8c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58df095b732529ade8f4051b41d7c29731afecd6
+refs/heads/master: 26c78e156b1d1b2387ec33b5f2fb62d6e0a186a3
diff --git a/trunk/fs/nfs/delegation.c b/trunk/fs/nfs/delegation.c
index 66cc720e3927..c6f07c1c71e6 100644
--- a/trunk/fs/nfs/delegation.c
+++ b/trunk/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 @@ int nfs_do_expire_all_delegations(void *ptr)
 		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);