Unverified Commit 42de9828 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14360 nfs: nfs4_callback_compound should put client with async mode 

Merge Pull Request from: @ci-robot 
 
PR sync from: Li Lingfeng <lilingfeng3@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/HFSBBCJYTBBUCGXGNGCPW5ERP557LDII/ 
 
https://gitee.com/openeuler/kernel/issues/IB4H3O 
 
Link:https://gitee.com/openeuler/kernel/pulls/14360

 

Reviewed-by: default avatarYuan Can <yuancan@huawei.com>
Signed-off-by: default avatarYuan Can <yuancan@huawei.com>
parents d4529c0b 3495a576

fs/nfs/callback_xdr.c

+3 −3
Original line number Diff line number Diff line
@@ -952,7 +952,7 @@ static __be32 nfs4_callback_compound(struct svc_rqst *rqstp) 
		cps.clp = nfs4_find_client_ident(SVC_NET(rqstp), hdr_arg.cb_ident);

		if (!cps.clp || !check_gss_callback_principal(cps.clp, rqstp)) {

			if (cps.clp)

				nfs_put_client(cps.clp);

				nfs_async_put_client(cps.clp);

			goto out_invalidcred;

		}

	}
@@ -962,7 +962,7 @@ static __be32 nfs4_callback_compound(struct svc_rqst *rqstp) 
	hdr_res.tag = hdr_arg.tag;

	if (encode_compound_hdr_res(&xdr_out, &hdr_res) != 0) {

		if (cps.clp)

			nfs_put_client(cps.clp);

			nfs_async_put_client(cps.clp);

		return rpc_system_err;

	}

	while (status == 0 && nops != hdr_arg.nops) {
@@ -982,7 +982,7 @@ static __be32 nfs4_callback_compound(struct svc_rqst *rqstp) 
	*hdr_res.status = status;

	*hdr_res.nops = htonl(nops);

	nfs4_cb_free_slot(&cps);

	nfs_put_client(cps.clp);

	nfs_async_put_client(cps.clp);

	return rpc_success;



out_invalidcred:

fs/nfs/client.c

+33 −0
Original line number Diff line number Diff line
@@ -283,6 +283,39 @@ void nfs_put_client(struct nfs_client *clp) 
}

EXPORT_SYMBOL_GPL(nfs_put_client);



static void nfs_free_client_work(struct work_struct *work)

{

	struct nfs_client *clp =

		container_of(work, struct nfs_client, free_work);



	clp->rpc_ops->free_client(clp);

}



/*

 * Similar to nfs_put_client, but call free_client with async mode

 */

void nfs_async_put_client(struct nfs_client *clp)

{

	struct nfs_net *nn;



	if (!clp)

		return;



	nn = net_generic(clp->cl_net, nfs_net_id);



	if (refcount_dec_and_lock(&clp->cl_count, &nn->nfs_client_lock)) {

		list_del(&clp->cl_share_link);

		nfs_cb_idr_remove_locked(clp);

		spin_unlock(&nn->nfs_client_lock);



		WARN_ON_ONCE(!list_empty(&clp->cl_superblocks));



		INIT_WORK(&clp->free_work, nfs_free_client_work);

		queue_work(nfsiod_workqueue, &clp->free_work);

	}

}

EXPORT_SYMBOL_GPL(nfs_async_put_client);



/*

 * Find an nfs_client on the list that matches the initialisation data

 * that is supplied.

fs/nfs/internal.h

+1 −0
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ void nfs_server_copy_userdata(struct nfs_server *, struct nfs_server *); 


extern void nfs_cleanup_cb_ident_idr(struct net *);

extern void nfs_put_client(struct nfs_client *);

extern void nfs_async_put_client(struct nfs_client *clp);

extern void nfs_free_client(struct nfs_client *);

extern struct nfs_client *nfs4_find_client_ident(struct net *, int);

extern struct nfs_client *

include/linux/nfs_fs_sb.h

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ struct nfs_client { 
	char *			cl_acceptor;	/* GSSAPI acceptor name */

	struct list_head	cl_share_link;	/* link in global client list */

	struct list_head	cl_superblocks;	/* List of nfs_server structs */

	struct work_struct	free_work;



	struct rpc_clnt *	cl_rpcclient;

	const struct nfs_rpc_ops *rpc_ops;	/* NFS protocol vector */