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

Commit b49e084d authored by Jeff Layton's avatar Jeff Layton Committed by J. Bruce Fields
Browse files

nfsd: do filp_close in sc_free callback for lock stateids 



Releasing locks when we unhash the stateid instead of doing so only when
the stateid is actually released will be problematic in later patches
when we need to protect the unhashing with spinlocks. Move it into the
sc_free operation instead.

Signed-off-by: default avatarJeff Layton <jlayton@primarydata.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 4770d722

fs/nfsd/nfs4state.c

+18 −8
Original line number Diff line number Diff line
@@ -502,7 +502,7 @@ static struct nfs4_stid *nfs4_alloc_stid(struct nfs4_client *cl, 
	return NULL;

}



static struct nfs4_ol_stateid * nfs4_alloc_stateid(struct nfs4_client *clp)

static struct nfs4_ol_stateid * nfs4_alloc_open_stateid(struct nfs4_client *clp)

{

	struct nfs4_stid *stid;

	struct nfs4_ol_stateid *stp;
@@ -907,16 +907,23 @@ static void nfs4_free_ol_stateid(struct nfs4_stid *stid) 
	kmem_cache_free(stateid_slab, stid);

}



static void __release_lock_stateid(struct nfs4_ol_stateid *stp)

static void nfs4_free_lock_stateid(struct nfs4_stid *stid)

{

	struct nfs4_ol_stateid *stp = openlockstateid(stid);

	struct nfs4_lockowner *lo = lockowner(stp->st_stateowner);

	struct file *file;



	file = find_any_file(stp->st_stid.sc_file);

	if (file)

		filp_close(file, (fl_owner_t)lo);

	nfs4_free_ol_stateid(stid);

}



static void __release_lock_stateid(struct nfs4_ol_stateid *stp)

{

	list_del(&stp->st_locks);

	unhash_generic_stateid(stp);

	unhash_stid(&stp->st_stid);

	file = find_any_file(stp->st_stid.sc_file);

	if (file)

		filp_close(file, (fl_owner_t)lockowner(stp->st_stateowner));

	nfs4_put_stid(&stp->st_stid);

}
@@ -3287,7 +3294,7 @@ nfsd4_process_open1(struct nfsd4_compound_state *cstate, 
		return nfserr_jukebox;

	open->op_openowner = oo;

alloc_stateid:

	open->op_stp = nfs4_alloc_stateid(clp);

	open->op_stp = nfs4_alloc_open_stateid(clp);

	if (!open->op_stp)

		return nfserr_jukebox;

	return nfs_ok;
@@ -4703,17 +4710,20 @@ alloc_init_lock_stateid(struct nfs4_lockowner *lo, struct nfs4_file *fp, 
		struct inode *inode,

		struct nfs4_ol_stateid *open_stp)

{

	struct nfs4_stid *s;

	struct nfs4_ol_stateid *stp;

	struct nfs4_client *clp = lo->lo_owner.so_client;



	stp = nfs4_alloc_stateid(clp);

	if (stp == NULL)

	s = nfs4_alloc_stid(clp, stateid_slab);

	if (s == NULL)

		return NULL;

	stp = openlockstateid(s);

	stp->st_stid.sc_type = NFS4_LOCK_STID;

	list_add(&stp->st_perstateowner, &lo->lo_owner.so_stateids);

	stp->st_stateowner = &lo->lo_owner;

	get_nfs4_file(fp);

	stp->st_stid.sc_file = fp;

	stp->st_stid.sc_free = nfs4_free_lock_stateid;

	stp->st_access_bmap = 0;

	stp->st_deny_bmap = open_stp->st_deny_bmap;

	stp->st_openstp = open_stp;