diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2011-09-02 16:08:20 (GMT) |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2011-09-02 23:59:29 (GMT) |
| commit | 77eaae8d44ec5942033b751d0e0d2914c9411862 (patch) | |
| tree | a1d4f668477145694fe4326ddb1cb507c9990b06 /fs/nfsd | |
| parent | 7a8711c9a6e2299c324c153da6e3381b1fd56128 (diff) | |
| download | linux-77eaae8d44ec5942033b751d0e0d2914c9411862.tar.xz | |
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')
| -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 8edc9ad..8694e60 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -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 * |