| Message ID | 20151105083952.GB19405@mwanda (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
> On Nov 5, 2015, at 3:39 AM, Dan Carpenter <dan.carpenter@oracle.com> wrote: > > The rpcrdma_create_req() function returns error pointers or success. It > never returns NULL. > > Fixes: f531a5dbc451 ('xprtrdma: Pre-allocate backward rpc_rqst and send/receive buffers') > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Chuck Lever <chuck.lever@oracle.com> > diff --git a/net/sunrpc/xprtrdma/backchannel.c b/net/sunrpc/xprtrdma/backchannel.c > index 2dcb44f..97554ca 100644 > --- a/net/sunrpc/xprtrdma/backchannel.c > +++ b/net/sunrpc/xprtrdma/backchannel.c > @@ -42,8 +42,8 @@ static int rpcrdma_bc_setup_rqst(struct rpcrdma_xprt *r_xprt, > size_t size; > > req = rpcrdma_create_req(r_xprt); > - if (!req) > - return -ENOMEM; > + if (IS_ERR(req)) > + return PTR_ERR(req); > req->rl_backchannel = true; > > size = RPCRDMA_INLINE_WRITE_THRESHOLD(rqst); — Chuck Lever -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 11/05/2015 03:39 AM, Dan Carpenter wrote: > The rpcrdma_create_req() function returns error pointers or success. It > never returns NULL. > > Fixes: f531a5dbc451 ('xprtrdma: Pre-allocate backward rpc_rqst and send/receive buffers') > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Thanks, Dan! These patches don't look urgent, so if it's okay with you then I'll save them for 4.5. Anna > > diff --git a/net/sunrpc/xprtrdma/backchannel.c b/net/sunrpc/xprtrdma/backchannel.c > index 2dcb44f..97554ca 100644 > --- a/net/sunrpc/xprtrdma/backchannel.c > +++ b/net/sunrpc/xprtrdma/backchannel.c > @@ -42,8 +42,8 @@ static int rpcrdma_bc_setup_rqst(struct rpcrdma_xprt *r_xprt, > size_t size; > > req = rpcrdma_create_req(r_xprt); > - if (!req) > - return -ENOMEM; > + if (IS_ERR(req)) > + return PTR_ERR(req); > req->rl_backchannel = true; > > size = RPCRDMA_INLINE_WRITE_THRESHOLD(rqst); > -- > To unsubscribe from this list: send the line "unsubscribe linux-nfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Nov 06, 2015 at 01:34:50PM -0500, Anna Schumaker wrote: > On 11/05/2015 03:39 AM, Dan Carpenter wrote: > > The rpcrdma_create_req() function returns error pointers or success. It > > never returns NULL. > > > > Fixes: f531a5dbc451 ('xprtrdma: Pre-allocate backward rpc_rqst and send/receive buffers') > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > > Thanks, Dan! These patches don't look urgent, so if it's okay with you then I'll save them for 4.5. To be honest, I only ever care about linux-next and not released versions. :P As long as it's in linux-next I'll be happy. regards, dan carpenter -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/sunrpc/xprtrdma/backchannel.c b/net/sunrpc/xprtrdma/backchannel.c index 2dcb44f..97554ca 100644 --- a/net/sunrpc/xprtrdma/backchannel.c +++ b/net/sunrpc/xprtrdma/backchannel.c @@ -42,8 +42,8 @@ static int rpcrdma_bc_setup_rqst(struct rpcrdma_xprt *r_xprt, size_t size; req = rpcrdma_create_req(r_xprt); - if (!req) - return -ENOMEM; + if (IS_ERR(req)) + return PTR_ERR(req); req->rl_backchannel = true; size = RPCRDMA_INLINE_WRITE_THRESHOLD(rqst);
The rpcrdma_create_req() function returns error pointers or success. It never returns NULL. Fixes: f531a5dbc451 ('xprtrdma: Pre-allocate backward rpc_rqst and send/receive buffers') Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html