ceph: allow ceph_put_mds_session to take NULL or ERR_PTR

jtlayton · idryomov · commit 7e65624d32b6 · 2021-06-29T00:15:52.000+02:00
...to simplify some error paths.

Signed-off-by: Jeff Layton &lt;jlayton@kernel.org&gt;
Reviewed-by: Luis Henriques &lt;lhenriques@suse.de&gt;
Signed-off-by: Ilya Dryomov &lt;idryomov@gmail.com&gt;
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
@@ -1809,8 +1809,7 @@ 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);
+	ceph_put_mds_session(di->lease_session);
 	kmem_cache_free(ceph_dentry_cachep, di);
 }
 
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
@@ -1154,8 +1154,7 @@ 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);
+	ceph_put_mds_session(old_lease_session);
 }
 
 /*
@@ -1200,8 +1199,7 @@ 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);
+	ceph_put_mds_session(old_lease_session);
 }
 
 /*
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
@@ -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,8 +1441,7 @@ 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);
+		ceph_put_mds_session(ts);
 	}
 }
 
diff --git a/fs/ceph/metric.c b/fs/ceph/metric.c
@@ -311,8 +311,7 @@ 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);
+	ceph_put_mds_session(m->session);
 }
 
 #define METRIC_UPDATE_MIN_MAX(min, max, new)	\

Original file line number	Diff line number	Diff line change
`@@ -1809,8 +1809,7 @@ static void ceph_d_release(struct dentry *dentry)`
`1809`	`1809`	`dentry->d_fsdata = NULL;`
`1810`	`1810`	`spin_unlock(&dentry->d_lock);`
`1811`	`1811`
`1812`		`- if (di->lease_session)`
`1813`		`- ceph_put_mds_session(di->lease_session);`
	`1812`	`+ ceph_put_mds_session(di->lease_session);`
`1814`	`1813`	`kmem_cache_free(ceph_dentry_cachep, di);`
`1815`	`1814`	`}`
`1816`	`1815`
Original file line number	Diff line number	Diff line change
`@@ -664,6 +664,9 @@ struct ceph_mds_session ceph_get_mds_session(struct ceph_mds_session s)`
`664`	`664`
`665`	`665`	`void ceph_put_mds_session(struct ceph_mds_session *s)`
`666`	`666`	`{`
	`667`	`+ if (IS_ERR_OR_NULL(s))`
	`668`	`+ return;`
	`669`	`+`
`667`	`670`	`dout("mdsc put_session %p %d -> %d\n", s,`
`668`	`671`	`refcount_read(&s->s_ref), refcount_read(&s->s_ref)-1);`
`669`	`672`	`if (refcount_dec_and_test(&s->s_ref)) {`
`@@ -1438,8 +1441,7 @@ static void __open_export_target_sessions(struct ceph_mds_client *mdsc,`
`1438`	`1441`
`1439`	`1442`	`for (i = 0; i < mi->num_export_targets; i++) {`
`1440`	`1443`	`ts = __open_export_target_session(mdsc, mi->export_targets[i]);`
`1441`		`- if (!IS_ERR(ts))`
`1442`		`- ceph_put_mds_session(ts);`
	`1444`	`+ ceph_put_mds_session(ts);`
`1443`	`1445`	`}`
`1444`	`1446`	`}`
`1445`	`1447`
Original file line number	Diff line number	Diff line change
`@@ -311,8 +311,7 @@ void ceph_metric_destroy(struct ceph_client_metric *m)`
`311`	`311`
`312`	`312`	`cancel_delayed_work_sync(&m->delayed_work);`
`313`	`313`
`314`		`- if (m->session)`
`315`		`- ceph_put_mds_session(m->session);`
	`314`	`+ ceph_put_mds_session(m->session);`
`316`	`315`	`}`
`317`	`316`
`318`	`317`	`#define METRIC_UPDATE_MIN_MAX(min, max, new) \`