UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

sunrpc: replace svc_serv->sv_bc_xprt by boolean flag 

svc_serv-> sv_bc_xprt is netns-unsafe and cannot be used as pointer.
To prevent its misuse in future it is replaced by new boolean flag.

Signed-off-by: Vasily Averin <vvs@virtuozzo.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Vasily Averin 2018-12-24 14:45:04 +03:00 committed by J. Bruce Fields
parent d4b09acf92
commit a289ce5311
5 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/nfs/callback.c
View File

@ -206,11 +206,13 @@ static int nfs_callback_up_net(int minorversion, struct svc_serv *serv,
goto err_bind; goto err_bind;
} }
ret = -EPROTONOSUPPORT; ret = 0;
if (!IS_ENABLED(CONFIG_NFS_V4_1) || minorversion == 0) if (!IS_ENABLED(CONFIG_NFS_V4_1) || minorversion == 0)
ret = nfs4_callback_up_net(serv, net); ret = nfs4_callback_up_net(serv, net);
else if (xprt->ops->bc_up) else if (xprt->ops->bc_setup)
ret = xprt->ops->bc_up(serv, net); serv->sv_bc_enabled = true;
else
ret = -EPROTONOSUPPORT;
if (ret < 0) { if (ret < 0) {
printk(KERN_ERR "NFS: callback service start failed\n"); printk(KERN_ERR "NFS: callback service start failed\n");

10
include/linux/sunrpc/bc_xprt.h
View File

@ -47,11 +47,9 @@ void xprt_free_bc_rqst(struct rpc_rqst *req);
/* /*
* Determine if a shared backchannel is in use * Determine if a shared backchannel is in use
*/ */
static inline int svc_is_backchannel(const struct svc_rqst *rqstp) static inline bool svc_is_backchannel(const struct svc_rqst *rqstp)
{ {
if (rqstp->rq_server->sv_bc_xprt) return rqstp->rq_server->sv_bc_enabled;
return 1;
return 0;
} }
#else /* CONFIG_SUNRPC_BACKCHANNEL */ #else /* CONFIG_SUNRPC_BACKCHANNEL */
static inline int xprt_setup_backchannel(struct rpc_xprt *xprt, static inline int xprt_setup_backchannel(struct rpc_xprt *xprt,
@ -60,9 +58,9 @@ static inline int xprt_setup_backchannel(struct rpc_xprt *xprt,
return 0; return 0;
} }
static inline int svc_is_backchannel(const struct svc_rqst *rqstp) static inline bool svc_is_backchannel(const struct svc_rqst *rqstp)
{ {
return 0; return false;
} }
static inline void xprt_free_bc_request(struct rpc_rqst *req) static inline void xprt_free_bc_request(struct rpc_rqst *req)

2
include/linux/sunrpc/svc.h
View File

@ -109,7 +109,7 @@ struct svc_serv {
spinlock_t sv_cb_lock; /* protects the svc_cb_list */ spinlock_t sv_cb_lock; /* protects the svc_cb_list */
wait_queue_head_t sv_cb_waitq; /* sleep here if there are no wait_queue_head_t sv_cb_waitq; /* sleep here if there are no
* entries in the svc_cb_list */ * entries in the svc_cb_list */
struct svc_xprt *sv_bc_xprt; /* callback on fore channel */ bool sv_bc_enabled; /* service uses backchannel */
#endif /* CONFIG_SUNRPC_BACKCHANNEL */ #endif /* CONFIG_SUNRPC_BACKCHANNEL */
}; };

2
net/sunrpc/svcsock.c
View File

@ -1623,8 +1623,6 @@ static struct svc_xprt *svc_bc_create_socket(struct svc_serv *serv,
svc_xprt_init(net, &svc_tcp_bc_class, xprt, serv); svc_xprt_init(net, &svc_tcp_bc_class, xprt, serv);
set_bit(XPT_CONG_CTRL, &svsk->sk_xprt.xpt_flags); set_bit(XPT_CONG_CTRL, &svsk->sk_xprt.xpt_flags);
serv->sv_bc_xprt = xprt;
return xprt; return xprt;
} }

1
net/sunrpc/xprtrdma/svc_rdma_transport.c
View File

@ -136,7 +136,6 @@ static struct svc_xprt *svc_rdma_bc_create(struct svc_serv *serv,
svc_xprt_init(net, &svc_rdma_bc_class, xprt, serv); svc_xprt_init(net, &svc_rdma_bc_class, xprt, serv);
set_bit(XPT_CONG_CTRL, &xprt->xpt_flags); set_bit(XPT_CONG_CTRL, &xprt->xpt_flags);
serv->sv_bc_xprt = xprt;
dprintk("svcrdma: %s(%p)\n", __func__, xprt); dprintk("svcrdma: %s(%p)\n", __func__, xprt);
return xprt; return xprt;