Skip to content

Commit

Permalink
nfsd4: simplify check_open logic
Browse files Browse the repository at this point in the history
Sometimes the single-exit style is good, sometimes it's unnecessarily
convoluted....

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
  • Loading branch information
J. Bruce Fields committed Sep 2, 2011
1 parent 7a8711c commit 77eaae8
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions fs/nfsd/nfs4state.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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 *
Expand Down

0 comments on commit 77eaae8

Please sign in to comment.