From: Andy Grover <andy.grover@oracle.com>
To: netdev@vger.kernel.org
Cc: rds-devel@oss.oracle.com
Subject: [PATCH 3/5] RDS: Clean up error handling in rds_cmsg_rdma_args
Date: Thu, 28 Oct 2010 18:40:57 -0700 [thread overview]
Message-ID: <1288316459-4679-4-git-send-email-andy.grover@oracle.com> (raw)
In-Reply-To: <1288316459-4679-1-git-send-email-andy.grover@oracle.com>
We don't need to set ret = 0 at the end -- it's initialized to 0.
Also, don't increment s_send_rdma stat if we're exiting with an
error.
Signed-off-by: Andy Grover <andy.grover@oracle.com>
---
net/rds/rdma.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/net/rds/rdma.c b/net/rds/rdma.c
index d0ba2ca..334acdd 100644
--- a/net/rds/rdma.c
+++ b/net/rds/rdma.c
@@ -664,13 +664,12 @@ int rds_cmsg_rdma_args(struct rds_sock *rs, struct rds_message *rm,
}
op->op_bytes = nr_bytes;
- ret = 0;
out:
kfree(pages);
if (ret)
rds_rdma_free_op(op);
-
- rds_stats_inc(s_send_rdma);
+ else
+ rds_stats_inc(s_send_rdma);
return ret;
}
--
1.7.1
next prev parent reply other threads:[~2010-10-29 1:41 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-29 1:40 [PATCH 0/5] RDS rds_iovec fixes Andy Grover
2010-10-29 1:40 ` [PATCH 1/5] net: fix rds_iovec page count overflow Andy Grover
2010-10-29 1:40 ` [PATCH 2/5] RDS: Return -EINVAL if rds_rdma_pages returns an error Andy Grover
2010-10-29 1:40 ` Andy Grover [this message]
2010-10-29 1:40 ` [PATCH 4/5] RDS: Copy rds_iovecs into kernel memory instead of rereading from userspace Andy Grover
2010-10-29 1:40 ` [PATCH 5/5] RDS: Let rds_message_alloc_sgs() return NULL Andy Grover
2010-10-30 23:34 ` [PATCH 0/5] RDS rds_iovec fixes David Miller
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=1288316459-4679-4-git-send-email-andy.grover@oracle.com \
--to=andy.grover@oracle.com \
--cc=netdev@vger.kernel.org \
--cc=rds-devel@oss.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).