Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47474d0b authored by Chengguang Xu's avatar Chengguang Xu Committed by Ilya Dryomov
Browse files

ceph: optimize mds session register 



Do memory allocation first, so that avoid unnecessary
initialization of newly allocated session in error case.

Signed-off-by: default avatarChengguang Xu <cgxu519@gmx.com>
Reviewed-by: default avatar"Yan, Zheng" <zyan@redhat.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 57a35dfb

fs/ceph/mds_client.c

+19 −17
Original line number Original line Diff line number Diff line
@@ -448,6 +448,25 @@ static struct ceph_mds_session *register_session(struct ceph_mds_client *mdsc, 
	s = kzalloc(sizeof(*s), GFP_NOFS);

	s = kzalloc(sizeof(*s), GFP_NOFS);

	if (!s)

	if (!s)

		return ERR_PTR(-ENOMEM);

		return ERR_PTR(-ENOMEM);



	if (mds >= mdsc->max_sessions) {

		int newmax = 1 << get_count_order(mds + 1);

		struct ceph_mds_session **sa;



		dout("%s: realloc to %d\n", __func__, newmax);

		sa = kcalloc(newmax, sizeof(void *), GFP_NOFS);

		if (!sa)

			goto fail_realloc;

		if (mdsc->sessions) {

			memcpy(sa, mdsc->sessions,

			       mdsc->max_sessions * sizeof(void *));

			kfree(mdsc->sessions);

		}

		mdsc->sessions = sa;

		mdsc->max_sessions = newmax;

	}



	dout("%s: mds%d\n", __func__, mds);

	s->s_mdsc = mdsc;

	s->s_mdsc = mdsc;

	s->s_mds = mds;

	s->s_mds = mds;

	s->s_state = CEPH_MDS_SESSION_NEW;

	s->s_state = CEPH_MDS_SESSION_NEW;
@@ -476,23 +495,6 @@ static struct ceph_mds_session *register_session(struct ceph_mds_client *mdsc, 
	INIT_LIST_HEAD(&s->s_cap_releases);

	INIT_LIST_HEAD(&s->s_cap_releases);

	INIT_LIST_HEAD(&s->s_cap_flushing);

	INIT_LIST_HEAD(&s->s_cap_flushing);





	dout("register_session mds%d\n", mds);

	if (mds >= mdsc->max_sessions) {

		int newmax = 1 << get_count_order(mds+1);

		struct ceph_mds_session **sa;



		dout("register_session realloc to %d\n", newmax);

		sa = kcalloc(newmax, sizeof(void *), GFP_NOFS);

		if (!sa)

			goto fail_realloc;

		if (mdsc->sessions) {

			memcpy(sa, mdsc->sessions,

			       mdsc->max_sessions * sizeof(void *));

			kfree(mdsc->sessions);

		}

		mdsc->sessions = sa;

		mdsc->max_sessions = newmax;

	}

	mdsc->sessions[mds] = s;

	mdsc->sessions[mds] = s;

	atomic_inc(&mdsc->num_sessions);

	atomic_inc(&mdsc->num_sessions);

	refcount_inc(&s->s_ref);  /* one ref to sessions[], one to caller */

	refcount_inc(&s->s_ref);  /* one ref to sessions[], one to caller */