svcrdma: fix error handling of rdma_alloc_frmr()
Subsystems (3)
PATCH 1/1 svcrdma: fix error handling of rdma_alloc_frmr()
ib_alloc_fast_reg_mr() and ib_alloc_fast_reg_page_list() returns ERR_PTR() and not NULL. Compile tested only.
Signed-off-by Wei Yongjun <[email protected]>
--- net/sunrpc/xprtrdma/svc_rdma_transport.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
net/sunrpc/xprtrdma/svc_rdma_transport.c +2 -2
@@ -730,12 +730,12 @@ static struct svc_rdma_fastreg_mr *rdma_alloc_frmr(struct svcxprt_rdma *xprt) goto err; mr =ib_alloc_fast_reg_mr (xprt->sc_pd,RPCSVC_MAXPAGES ); -if (!mr) +if (IS_ERR (mr)) goto err_free_frmr; pl =ib_alloc_fast_reg_page_list (xprt->sc_cm_id->device,RPCSVC_MAXPAGES ); -if (!pl) +if (IS_ERR (pl)) goto err_free_mr; frmr->mr = mr;
Signature · 1 line
1.6.2.2
Thanks, queued up for 2.6.31. Looks obvious correct, but runtime testing from anyone would always be appreciated.
--b.
Quoted 33 lines · Wei Yongjun
ib_alloc_fast_reg_mr()andib_alloc_fast_reg_page_list()returnsERR_PTR()and not NULL. Compile tested only.Signed-off-by Wei Yongjun <[email protected]>--- net/sunrpc/xprtrdma/svc_rdma_transport.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)net/sunrpc/xprtrdma/svc_rdma_transport.c +2
-2@@ -730,12 +730,12 @@ static struct svc_rdma_fastreg_mr *rdma_alloc_frmr(struct svcxprt_rdma *xprt) goto err; mr =ib_alloc_fast_reg_mr (xprt->sc_pd,RPCSVC_MAXPAGES ); -if (!mr) +if (IS_ERR (mr)) goto err_free_frmr; pl =ib_alloc_fast_reg_page_list (xprt->sc_cm_id->device,RPCSVC_MAXPAGES ); -if (!pl) +if (IS_ERR (pl)) goto err_free_mr; frmr->mr = mr;Signature · 1 line
1.6.2.2