Commit 7e65624d authored by Jeff Layton's avatar Jeff Layton Committed by Ilya Dryomov
Browse files

ceph: allow ceph_put_mds_session to take NULL or ERR_PTR 



...to simplify some error paths.

Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Reviewed-by: default avatarLuis Henriques <lhenriques@suse.de>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent df2c0cb7

fs/ceph/dir.c

+1 −2
Original line number Diff line number Diff line
@@ -1809,7 +1809,6 @@ static void ceph_d_release(struct dentry *dentry) 
	dentry->d_fsdata = NULL;

	spin_unlock(&dentry->d_lock);



	if (di->lease_session)

	ceph_put_mds_session(di->lease_session);

	kmem_cache_free(ceph_dentry_cachep, di);

}

fs/ceph/inode.c

+2 −4
Original line number Diff line number Diff line
@@ -1154,7 +1154,6 @@ static inline void update_dentry_lease(struct inode *dir, struct dentry *dentry, 
	__update_dentry_lease(dir, dentry, lease, session, from_time,

			      &old_lease_session);

	spin_unlock(&dentry->d_lock);

	if (old_lease_session)

	ceph_put_mds_session(old_lease_session);

}
@@ -1200,7 +1199,6 @@ static void update_dentry_lease_careful(struct dentry *dentry, 
			      from_time, &old_lease_session);

out_unlock:

	spin_unlock(&dentry->d_lock);

	if (old_lease_session)

	ceph_put_mds_session(old_lease_session);

}

fs/ceph/mds_client.c

+4 −2
Original line number Diff line number Diff line
@@ -664,6 +664,9 @@ struct ceph_mds_session *ceph_get_mds_session(struct ceph_mds_session *s) 


void ceph_put_mds_session(struct ceph_mds_session *s)

{

	if (IS_ERR_OR_NULL(s))

		return;



	dout("mdsc put_session %p %d -> %d\n", s,

	     refcount_read(&s->s_ref), refcount_read(&s->s_ref)-1);

	if (refcount_dec_and_test(&s->s_ref)) {
@@ -1438,7 +1441,6 @@ static void __open_export_target_sessions(struct ceph_mds_client *mdsc, 


	for (i = 0; i < mi->num_export_targets; i++) {

		ts = __open_export_target_session(mdsc, mi->export_targets[i]);

		if (!IS_ERR(ts))

		ceph_put_mds_session(ts);

	}

}

fs/ceph/metric.c

+1 −2
Original line number Diff line number Diff line
@@ -311,7 +311,6 @@ void ceph_metric_destroy(struct ceph_client_metric *m) 


	cancel_delayed_work_sync(&m->delayed_work);



	if (m->session)

	ceph_put_mds_session(m->session);

}