All of lore.kernel.org
 help / color / mirror / Atom feed
From: Zhu Yanjun <yanjun.zhu@oracle.com>
To: santosh.shilimkar@oracle.com, netdev@vger.kernel.org,
	linux-rdma@vger.kernel.org, rds-devel@oss.oracle.com,
	leon@kernel.org
Subject: [PATCHv3 2/4] rds: ib: remove redundant ib_dealloc_fmr
Date: Mon, 13 Mar 2017 01:43:46 -0400	[thread overview]
Message-ID: <1489383828-7699-3-git-send-email-yanjun.zhu@oracle.com> (raw)
In-Reply-To: <1489383828-7699-1-git-send-email-yanjun.zhu@oracle.com>

The function ib_dealloc_fmr will never be called. As such, it should
be removed.

Cc: Joe Jin <joe.jin@oracle.com>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Acked-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Signed-off-by: Zhu Yanjun <yanjun.zhu@oracle.com>
---
 net/rds/ib_fmr.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/net/rds/ib_fmr.c b/net/rds/ib_fmr.c
index 4fe8f4f..249ae1c 100644
--- a/net/rds/ib_fmr.c
+++ b/net/rds/ib_fmr.c
@@ -78,12 +78,9 @@ struct rds_ib_mr *rds_ib_alloc_fmr(struct rds_ib_device *rds_ibdev, int npages)
 	return ibmr;
 
 out_no_cigar:
-	if (ibmr) {
-		if (fmr->fmr)
-			ib_dealloc_fmr(fmr->fmr);
-		kfree(ibmr);
-	}
+	kfree(ibmr);
 	atomic_dec(&pool->item_count);
+
 	return ERR_PTR(err);
 }
 
-- 
2.7.4

  parent reply	other threads:[~2017-03-13  5:43 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-13  5:43 [PATCHv3 0/4] rds: ib: trivial patches Zhu Yanjun
     [not found] ` <1489383828-7699-1-git-send-email-yanjun.zhu-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
2017-03-13  5:43   ` [PATCHv3 1/4] rds: ib: drop unnecessary rdma_reject Zhu Yanjun
     [not found]     ` <1489383828-7699-2-git-send-email-yanjun.zhu-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
2017-03-13  6:32       ` Leon Romanovsky
     [not found]         ` <20170313063224.GJ2079-U/DQcQFIOTAAJjI8aNfphQ@public.gmane.org>
2017-03-13  6:41           ` Yanjun Zhu
     [not found]             ` <58C63F06.6090804-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
2017-03-13  9:23               ` Leon Romanovsky
2017-03-14  6:20   ` [PATCHv3 0/4] rds: ib: trivial patches David Miller
2017-03-13  5:43 ` Zhu Yanjun [this message]
2017-03-13  5:43 ` [PATCHv3 3/4] rds: ib: add the static type to the function Zhu Yanjun
2017-03-13  5:43 ` [PATCHv3 4/4] rds: ib: unmap the scatter/gather list when error Zhu Yanjun

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1489383828-7699-3-git-send-email-yanjun.zhu@oracle.com \
    --to=yanjun.zhu@oracle.com \
    --cc=leon@kernel.org \
    --cc=linux-rdma@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=rds-devel@oss.oracle.com \
    --cc=santosh.shilimkar@oracle.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.