Skip to content

L
linux-davinci
Commit 76723de0 authored by Trond Myklebust's avatar Trond Myklebust
Browse files
Options

NFSv4: Fix incorrect semaphore release in _nfs4_do_open() 

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 7a524111
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
fs/nfs/nfs4proc.c
View file @ 76723de0
...@@ -970,7 +970,7 @@ static int _nfs4_do_open(struct inode *dir, struct dentry *dentry, int flags, st ...@@ -970,7 +970,7 @@ static int _nfs4_do_open(struct inode *dir, struct dentry *dentry, int flags, st
status = -ENOMEM; status = -ENOMEM;
opendata = nfs4_opendata_alloc(dentry, sp, flags, sattr); opendata = nfs4_opendata_alloc(dentry, sp, flags, sattr);
if (opendata == NULL) if (opendata == NULL)
goto err_put_state_owner; goto err_release_rwsem;
status = _nfs4_proc_open(opendata); status = _nfs4_proc_open(opendata);
if (status != 0) if (status != 0)
...@@ -989,11 +989,11 @@ static int _nfs4_do_open(struct inode *dir, struct dentry *dentry, int flags, st ...@@ -989,11 +989,11 @@ static int _nfs4_do_open(struct inode *dir, struct dentry *dentry, int flags, st
return 0; return 0;
err_opendata_free: err_opendata_free:
nfs4_opendata_free(opendata); nfs4_opendata_free(opendata);
err_release_rwsem:
up_read(&clp->cl_sem);
err_put_state_owner: err_put_state_owner:
nfs4_put_state_owner(sp); nfs4_put_state_owner(sp);
out_err: out_err:
/* Note: clp->cl_sem must be released before nfs4_put_open_state()! */
up_read(&clp->cl_sem);
*res = NULL; *res = NULL;
return status; return status;
} }
......
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