Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77eaae8d authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

nfsd4: simplify check_open logic 



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

Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 7a8711c9

fs/nfsd/nfs4state.c

+2 −5
Original line number Diff line number Diff line
@@ -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 *