dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

nfsd4: simplify check_open logic 

Sometimes the single-exit style is good, sometimes it's unnecessarily
convoluted....

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
J. Bruce Fields 2011-09-02 12:08:20 -04:00
parent 7a8711c9a6
commit 77eaae8d44
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/nfsd/nfs4state.c
View File

@ -2573,7 +2573,6 @@ static __be32
nfs4_check_open(struct nfs4_file *fp, struct nfsd4_open *open, struct nfs4_stateid **stpp)
{
struct nfs4_stateid *local;
__be32 status = nfserr_share_denied;
struct nfs4_stateowner *sop = open->op_stateowner;
list_for_each_entry(local, &fp->fi_stateids, st_perfile) {
@ -2585,11 +2584,9 @@ nfs4_check_open(struct nfs4_file *fp, struct nfsd4_open *open, struct nfs4_state
*stpp = local;
/* check for conflicting share reservations */
if (!test_share(local, open))
goto out;
return nfserr_share_denied;
}
status = 0;
out:
return status;
return nfs_ok;
}
static inline struct nfs4_stateid *