svc: Simplify ->xpo_secure_port
Clean up: Instead of returning a value that is used to set or clear a bit, just make ->xpo_secure_port mangle that bit, and return void. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
parent
63a1b15693
commit
989f881ebf
|
@ -25,7 +25,7 @@ struct svc_xprt_ops {
|
||||||
void (*xpo_release_rqst)(struct svc_rqst *);
|
void (*xpo_release_rqst)(struct svc_rqst *);
|
||||||
void (*xpo_detach)(struct svc_xprt *);
|
void (*xpo_detach)(struct svc_xprt *);
|
||||||
void (*xpo_free)(struct svc_xprt *);
|
void (*xpo_free)(struct svc_xprt *);
|
||||||
int (*xpo_secure_port)(struct svc_rqst *);
|
void (*xpo_secure_port)(struct svc_rqst *rqstp);
|
||||||
void (*xpo_kill_temp_xprt)(struct svc_xprt *);
|
void (*xpo_kill_temp_xprt)(struct svc_xprt *);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -844,10 +844,7 @@ int svc_recv(struct svc_rqst *rqstp, long timeout)
|
||||||
|
|
||||||
clear_bit(XPT_OLD, &xprt->xpt_flags);
|
clear_bit(XPT_OLD, &xprt->xpt_flags);
|
||||||
|
|
||||||
if (xprt->xpt_ops->xpo_secure_port(rqstp))
|
xprt->xpt_ops->xpo_secure_port(rqstp);
|
||||||
set_bit(RQ_SECURE, &rqstp->rq_flags);
|
|
||||||
else
|
|
||||||
clear_bit(RQ_SECURE, &rqstp->rq_flags);
|
|
||||||
rqstp->rq_chandle.defer = svc_defer;
|
rqstp->rq_chandle.defer = svc_defer;
|
||||||
rqstp->rq_xid = svc_getu32(&rqstp->rq_arg.head[0]);
|
rqstp->rq_xid = svc_getu32(&rqstp->rq_arg.head[0]);
|
||||||
|
|
||||||
|
|
|
@ -391,9 +391,12 @@ static void svc_sock_setbufsize(struct socket *sock, unsigned int snd,
|
||||||
release_sock(sock->sk);
|
release_sock(sock->sk);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int svc_sock_secure_port(struct svc_rqst *rqstp)
|
static void svc_sock_secure_port(struct svc_rqst *rqstp)
|
||||||
{
|
{
|
||||||
return svc_port_is_privileged(svc_addr(rqstp));
|
if (svc_port_is_privileged(svc_addr(rqstp)))
|
||||||
|
set_bit(RQ_SECURE, &rqstp->rq_flags);
|
||||||
|
else
|
||||||
|
clear_bit(RQ_SECURE, &rqstp->rq_flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -69,7 +69,7 @@ static void svc_rdma_release_rqst(struct svc_rqst *);
|
||||||
static void svc_rdma_detach(struct svc_xprt *xprt);
|
static void svc_rdma_detach(struct svc_xprt *xprt);
|
||||||
static void svc_rdma_free(struct svc_xprt *xprt);
|
static void svc_rdma_free(struct svc_xprt *xprt);
|
||||||
static int svc_rdma_has_wspace(struct svc_xprt *xprt);
|
static int svc_rdma_has_wspace(struct svc_xprt *xprt);
|
||||||
static int svc_rdma_secure_port(struct svc_rqst *);
|
static void svc_rdma_secure_port(struct svc_rqst *);
|
||||||
static void svc_rdma_kill_temp_xprt(struct svc_xprt *);
|
static void svc_rdma_kill_temp_xprt(struct svc_xprt *);
|
||||||
|
|
||||||
static const struct svc_xprt_ops svc_rdma_ops = {
|
static const struct svc_xprt_ops svc_rdma_ops = {
|
||||||
|
@ -988,9 +988,9 @@ static int svc_rdma_has_wspace(struct svc_xprt *xprt)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int svc_rdma_secure_port(struct svc_rqst *rqstp)
|
static void svc_rdma_secure_port(struct svc_rqst *rqstp)
|
||||||
{
|
{
|
||||||
return 1;
|
set_bit(RQ_SECURE, &rqstp->rq_flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void svc_rdma_kill_temp_xprt(struct svc_xprt *xprt)
|
static void svc_rdma_kill_temp_xprt(struct svc_xprt *xprt)
|
||||||
|
|
Loading…
Reference in New Issue