NFS rename client back channel transport field (4a19de0f) · Commits · 戴 / test

fs/nfs/callback.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -142,7 +142,7 @@ int nfs4_set_callback_sessionid(struct nfs_client *clp)
		struct svc_serv *serv = clp->cl_rpcclient->cl_xprt->bc_serv;
		struct nfs4_sessionid *bc_sid;

		if (!serv->bc_xprt)
		if (!serv->sv_bc_xprt)
		return -EINVAL;

		/* on success freed in xprt_free */
		@@ -152,12 +152,12 @@ int nfs4_set_callback_sessionid(struct nfs_client *clp)
		memcpy(bc_sid->data, &clp->cl_session->sess_id.data,
		NFS4_MAX_SESSIONID_LEN);
		spin_lock_bh(&serv->sv_cb_lock);
		serv->bc_xprt->xpt_bc_sid = bc_sid;
		serv->sv_bc_xprt->xpt_bc_sid = bc_sid;
		spin_unlock_bh(&serv->sv_cb_lock);
		dprintk("%s set xpt_bc_sid=%u:%u:%u:%u for bc_xprt %p\n", __func__,
		dprintk("%s set xpt_bc_sid=%u:%u:%u:%u for sv_bc_xprt %p\n", __func__,
		((u32 )bc_sid->data)[0], ((u32 )bc_sid->data)[1],
		((u32 )bc_sid->data)[2], ((u32 )bc_sid->data)[3],
		serv->bc_xprt);
		serv->sv_bc_xprt);
		return 0;
		}

		@@ -228,8 +228,8 @@ nfs41_callback_up(struct svc_serv serv, struct rpc_xprt xprt)
		init_waitqueue_head(&serv->sv_cb_waitq);
		rqstp = svc_prepare_thread(serv, &serv->sv_pools[0]);
		if (IS_ERR(rqstp)) {
		svc_xprt_put(serv->bc_xprt);
		serv->bc_xprt = NULL;
		svc_xprt_put(serv->sv_bc_xprt);
		serv->sv_bc_xprt = NULL;
		}
		out:
		dprintk("--> %s return %ld\n", __func__,

+2 −2

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@ int bc_send(struct rpc_rqst *req);
		*/
		static inline int svc_is_backchannel(const struct svc_rqst *rqstp)
		{
		if (rqstp->rq_server->bc_xprt)
		if (rqstp->rq_server->sv_bc_xprt)
		return 1;
		return 0;
		}
		@@ -51,7 +51,7 @@ static inline struct nfs4_sessionid bc_xprt_sid(struct svc_rqst rqstp)
		{
		if (svc_is_backchannel(rqstp))
		return (struct nfs4_sessionid *)
		rqstp->rq_server->bc_xprt->xpt_bc_sid;
		rqstp->rq_server->sv_bc_xprt->xpt_bc_sid;
		return NULL;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -99,7 +99,7 @@ struct svc_serv {
		spinlock_t sv_cb_lock; /* protects the svc_cb_list */
		wait_queue_head_t sv_cb_waitq; /* sleep here if there are no
		* entries in the svc_cb_list */
		struct svc_xprt *bc_xprt;
		struct svc_xprt sv_bc_xprt; / callback on fore channel */
		#endif /* CONFIG_NFS_V4_1 */
		};

+1 −1

Original line number	Diff line number	Diff line
		@@ -1262,7 +1262,7 @@ bc_svc_process(struct svc_serv serv, struct rpc_rqst req,
		struct kvec *resv = &rqstp->rq_res.head[0];

		/* Build the svc_rqst used by the common processing routine */
		rqstp->rq_xprt = serv->bc_xprt;
		rqstp->rq_xprt = serv->sv_bc_xprt;
		rqstp->rq_xid = req->rq_xid;
		rqstp->rq_prot = req->rq_xprt->prot;
		rqstp->rq_server = serv;

+1 −1

Original line number	Diff line number	Diff line
		@@ -1595,7 +1595,7 @@ static struct svc_xprt svc_bc_create_socket(struct svc_serv serv,
		xprt = &svsk->sk_xprt;
		svc_xprt_init(&svc_tcp_bc_class, xprt, serv);

		serv->bc_xprt = xprt;
		serv->sv_bc_xprt = xprt;

		return xprt;
		}