diff options
author | J. Bruce Fields <bfields@redhat.com> | 2011-09-02 12:08:20 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2011-09-02 19:59:29 -0400 |
commit | 77eaae8d44ec5942033b751d0e0d2914c9411862 (patch) | |
tree | a1d4f668477145694fe4326ddb1cb507c9990b06 /fs/nfsd/nfs4state.c | |
parent | 7a8711c9a6e2299c324c153da6e3381b1fd56128 (diff) |
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>
Diffstat (limited to 'fs/nfsd/nfs4state.c')
-rw-r--r-- | fs/nfsd/nfs4state.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 8edc9ad63ea6..8694e60a4520 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
@@ -2573,7 +2573,6 @@ static __be32 | |||
2573 | nfs4_check_open(struct nfs4_file *fp, struct nfsd4_open *open, struct nfs4_stateid **stpp) | 2573 | nfs4_check_open(struct nfs4_file *fp, struct nfsd4_open *open, struct nfs4_stateid **stpp) |
2574 | { | 2574 | { |
2575 | struct nfs4_stateid *local; | 2575 | struct nfs4_stateid *local; |
2576 | __be32 status = nfserr_share_denied; | ||
2577 | struct nfs4_stateowner *sop = open->op_stateowner; | 2576 | struct nfs4_stateowner *sop = open->op_stateowner; |
2578 | 2577 | ||
2579 | list_for_each_entry(local, &fp->fi_stateids, st_perfile) { | 2578 | 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 | |||
2585 | *stpp = local; | 2584 | *stpp = local; |
2586 | /* check for conflicting share reservations */ | 2585 | /* check for conflicting share reservations */ |
2587 | if (!test_share(local, open)) | 2586 | if (!test_share(local, open)) |
2588 | goto out; | 2587 | return nfserr_share_denied; |
2589 | } | 2588 | } |
2590 | status = 0; | 2589 | return nfs_ok; |
2591 | out: | ||
2592 | return status; | ||
2593 | } | 2590 | } |
2594 | 2591 | ||
2595 | static inline struct nfs4_stateid * | 2592 | static inline struct nfs4_stateid * |