From: "Jεan Sacren" <sakiwit@gmail•com>
To: Ilya Dryomov <idryomov@gmail•com>
Cc: jlayton@kernel•org, davem@davemloft•net, kuba@kernel•org,
ceph-devel@vger•kernel.org, netdev@vger•kernel.org
Subject: [PATCH net-next] net: ceph: fix ->monmap and err initialization
Date: Mon, 11 Oct 2021 00:45:24 -0600 [thread overview]
Message-ID: <20211011064524.20003-1-sakiwit@gmail.com> (raw)
From: Jean Sacren <sakiwit@gmail•com>
Call to build_initial_monmap() is one stone two birds. Explicitly it
initializes err variable. Implicitly it initializes ->monmap via call to
kzalloc(). We should only declare err and ->monmap is taken care of by
ceph_monc_init() prototype.
Signed-off-by: Jean Sacren <sakiwit@gmail•com>
---
net/ceph/mon_client.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c
index 013cbdb6cfe2..6a6898ee4049 100644
--- a/net/ceph/mon_client.c
+++ b/net/ceph/mon_client.c
@@ -1153,12 +1153,11 @@ static int build_initial_monmap(struct ceph_mon_client *monc)
int ceph_monc_init(struct ceph_mon_client *monc, struct ceph_client *cl)
{
- int err = 0;
+ int err;
dout("init\n");
memset(monc, 0, sizeof(*monc));
monc->client = cl;
- monc->monmap = NULL;
mutex_init(&monc->mutex);
err = build_initial_monmap(monc);
next reply other threads:[~2021-10-11 6:45 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-11 6:45 Jεan Sacren [this message]
2021-10-11 11:31 ` [PATCH net-next] net: ceph: fix ->monmap and err initialization Ilya Dryomov
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=20211011064524.20003-1-sakiwit@gmail.com \
--to=sakiwit@gmail$(echo .)com \
--cc=ceph-devel@vger$(echo .)kernel.org \
--cc=davem@davemloft$(echo .)net \
--cc=idryomov@gmail$(echo .)com \
--cc=jlayton@kernel$(echo .)org \
--cc=kuba@kernel$(echo .)org \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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