Skip to content

L
linux-davinci-2.6.23
Commit 26c78e15 authored by Trond Myklebust's avatar Trond Myklebust
Browse files
Options

NFSv4: Fix an Oops in nfs_do_expire_all_delegations 

 If the loop errors, we need to exit.
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 58df095b
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
fs/nfs/delegation.c
View file @ 26c78e15
...@@ -236,7 +236,6 @@ int nfs_do_expire_all_delegations(void *ptr) ...@@ -236,7 +236,6 @@ int nfs_do_expire_all_delegations(void *ptr)
struct nfs4_client *clp = ptr; struct nfs4_client *clp = ptr;
struct nfs_delegation *delegation; struct nfs_delegation *delegation;
struct inode *inode; struct inode *inode;
int err = 0;
allow_signal(SIGKILL); allow_signal(SIGKILL);
restart: restart:
...@@ -250,9 +249,8 @@ restart: ...@@ -250,9 +249,8 @@ restart:
if (inode == NULL) if (inode == NULL)
continue; continue;
spin_unlock(&clp->cl_lock); spin_unlock(&clp->cl_lock);
err = nfs_inode_return_delegation(inode); nfs_inode_return_delegation(inode);
iput(inode); iput(inode);
if (!err)
goto restart; goto restart;
} }
out: out:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment