---

yaml --- r: 16650 b: refs/heads/master c: 26c78e1 h: refs/heads/master v: v3
git-mirror · Jan 6, 2006 · 156f6ec · 156f6ec
1 parent 703259d
commit 156f6ec
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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);