lkml.org 
[lkml]   [2016]   [Oct]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.7 112/141] SUNRPC: Silence WARN_ON when NFSv4.1 over RDMA is in use
    Date
    4.7-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Chuck Lever <chuck.lever@oracle.com>

    commit 16590a228109e2f318d2cc6466221134cfab723a upstream.

    Using NFSv4.1 on RDMA should be safe, so broaden the new checks in
    rpc_create().

    WARN_ON_ONCE is used, matching most other WARN call sites in clnt.c.

    Fixes: 39a9beab5acb ("rpc: share one xps between all backchannels")
    Fixes: d50039ea5ee6 ("nfsd4/rpc: move backchannel create logic...")
    Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
    Reviewed-by: J. Bruce Fields <bfields@fieldses.org>
    Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    net/sunrpc/clnt.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/net/sunrpc/clnt.c
    +++ b/net/sunrpc/clnt.c
    @@ -453,7 +453,7 @@ static struct rpc_clnt *rpc_create_xprt(
    struct rpc_xprt_switch *xps;

    if (args->bc_xprt && args->bc_xprt->xpt_bc_xps) {
    - WARN_ON(args->protocol != XPRT_TRANSPORT_BC_TCP);
    + WARN_ON_ONCE(!(args->protocol & XPRT_TRANSPORT_BC));
    xps = args->bc_xprt->xpt_bc_xps;
    xprt_switch_get(xps);
    } else {
    @@ -520,7 +520,7 @@ struct rpc_clnt *rpc_create(struct rpc_c
    char servername[48];

    if (args->bc_xprt) {
    - WARN_ON(args->protocol != XPRT_TRANSPORT_BC_TCP);
    + WARN_ON_ONCE(!(args->protocol & XPRT_TRANSPORT_BC));
    xprt = args->bc_xprt->xpt_bc_xprt;
    if (xprt) {
    xprt_get(xprt);

    \
     
     \ /
      Last update: 2016-10-06 11:39    [W:4.517 / U:0.588 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site