From cd536232c51951176693b32f034a1f6efa6c2074 Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Fri, 2 Sep 2011 12:08:20 -0400 Subject: [PATCH] --- yaml --- r: 267143 b: refs/heads/master c: 77eaae8d44ec5942033b751d0e0d2914c9411862 h: refs/heads/master i: 267141: e7beea066eda6195058df229dbba3997d54eaf12 267139: 4e66fab8debac3a5d1ca216c2a552c1b9e4ad14b 267135: 98ad9b908d4d636fc90297e5842aa3256cd78c65 v: v3 --- [refs] | 2 +- trunk/fs/nfsd/nfs4state.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 2e4d9bf24caa..917dc323c934 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7a8711c9a6e2299c324c153da6e3381b1fd56128 +refs/heads/master: 77eaae8d44ec5942033b751d0e0d2914c9411862 diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c index 8edc9ad63ea6..8694e60a4520 100644 --- a/trunk/fs/nfsd/nfs4state.c +++ b/trunk/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 *