On Mon, Oct 11, 2021 at 8:45 AM Jεan Sacren <sakiwit@xxxxxxxxx> wrote:
>
> From: Jean Sacren <sakiwit@xxxxxxxxx>
>
> 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@xxxxxxxxx>
> ---
> 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);
Applied.
Thanks,
Ilya
