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

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

nfsd: simplify nfs4_put_deleg_lease calls 



Every single caller gets the file out of the delegation, so let's do
that once in nfs4_put_deleg_lease.

Plus we'll need it there for other reasons.

Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
parent b8232d33

fs/nfsd/nfs4state.c

+6 −5
Original line number Diff line number Diff line
@@ -875,9 +875,10 @@ nfs4_inc_and_copy_stateid(stateid_t *dst, struct nfs4_stid *stid) 
	spin_unlock(&stid->sc_lock);

}



static void nfs4_put_deleg_lease(struct nfs4_file *fp)

static void nfs4_put_deleg_lease(struct nfs4_delegation *dp)

{

	struct file *filp = NULL;

	struct nfs4_file *fp = dp->dl_stid.sc_file;



	WARN_ON_ONCE(!fp->fi_delegees);
@@ -992,7 +993,7 @@ static void destroy_delegation(struct nfs4_delegation *dp) 
	spin_unlock(&state_lock);

	if (unhashed) {

		put_clnt_odstate(dp->dl_clnt_odstate);

		nfs4_put_deleg_lease(dp->dl_stid.sc_file);

		nfs4_put_deleg_lease(dp);

		nfs4_put_stid(&dp->dl_stid);

	}

}
@@ -1004,7 +1005,7 @@ static void revoke_delegation(struct nfs4_delegation *dp) 
	WARN_ON(!list_empty(&dp->dl_recall_lru));



	put_clnt_odstate(dp->dl_clnt_odstate);

	nfs4_put_deleg_lease(dp->dl_stid.sc_file);

	nfs4_put_deleg_lease(dp);



	if (clp->cl_minorversion == 0)

		nfs4_put_stid(&dp->dl_stid);
@@ -1916,7 +1917,7 @@ __destroy_client(struct nfs4_client *clp) 
		dp = list_entry(reaplist.next, struct nfs4_delegation, dl_recall_lru);

		list_del_init(&dp->dl_recall_lru);

		put_clnt_odstate(dp->dl_clnt_odstate);

		nfs4_put_deleg_lease(dp->dl_stid.sc_file);

		nfs4_put_deleg_lease(dp);

		nfs4_put_stid(&dp->dl_stid);

	}

	while (!list_empty(&clp->cl_revoked)) {
@@ -7287,7 +7288,7 @@ nfs4_state_shutdown_net(struct net *net) 
		dp = list_entry (pos, struct nfs4_delegation, dl_recall_lru);

		list_del_init(&dp->dl_recall_lru);

		put_clnt_odstate(dp->dl_clnt_odstate);

		nfs4_put_deleg_lease(dp->dl_stid.sc_file);

		nfs4_put_deleg_lease(dp);

		nfs4_put_stid(&dp->dl_stid);

	}