[7/7] ceph: just call get_session in __ceph_lookup_mds_session
diff mbox series

Message ID 20190425152843.14351-8-jlayton@kernel.org
State New
Headers show
  • ceph: various mdsc and cap handling cleanups for v5.2
Related show

Commit Message

Jeff Layton April 25, 2019, 3:28 p.m. UTC
I originally thought there was a potential race here, but the fact
that this is called with the mdsc->mutex held, ensures that the
last reference to the session can't be put here.

Still, it's clearer to just return the value from get_session here,
and may prevent a bug later if we ever rework this code to be less
reliant on mutexes.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
 fs/ceph/mds_client.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff mbox series

diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index a6b52e5935ae..a7e17383de23 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -550,13 +550,9 @@  void ceph_put_mds_session(struct ceph_mds_session *s)
 struct ceph_mds_session *__ceph_lookup_mds_session(struct ceph_mds_client *mdsc,
 						   int mds)
-	struct ceph_mds_session *session;
 	if (mds >= mdsc->max_sessions || !mdsc->sessions[mds])
 		return NULL;
-	session = mdsc->sessions[mds];
-	get_session(session);
-	return session;
+	return get_session(mdsc->sessions[mds]);
 static bool __have_session(struct ceph_mds_client *mdsc, int mds)