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

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

nfsd4: eliminate redundant nfs4_free_stateid 



Somehow we ended up with identical functions "nfs4_free_stateid" and
"free_generic_stateid".

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

fs/nfsd/nfs4state.c

+1 −6
Original line number Original line Diff line number Diff line
@@ -2705,11 +2705,6 @@ nfs4_check_open(struct nfs4_file *fp, struct nfsd4_open *open, struct nfs4_ol_st 
	return nfs_ok;

	return nfs_ok;

}

}





static void nfs4_free_stateid(struct nfs4_ol_stateid *s)

{

	kmem_cache_free(stateid_slab, s);

}



static inline int nfs4_access_to_access(u32 nfs4_access)

static inline int nfs4_access_to_access(u32 nfs4_access)

{

{

	int flags = 0;

	int flags = 0;
@@ -3088,7 +3083,7 @@ void nfsd4_cleanup_open_state(struct nfsd4_open *open, __be32 status) 
	if (open->op_file)

	if (open->op_file)

		nfsd4_free_file(open->op_file);

		nfsd4_free_file(open->op_file);

	if (open->op_stp)

	if (open->op_stp)

		nfs4_free_stateid(open->op_stp);

		free_generic_stateid(open->op_stp);

}

}





__be32

__be32