diff mbox series

[RFC,1/6] ceph: allow ceph_put_mds_session to take NULL or ERR_PTR

Message ID 20210615145730.21952-2-jlayton@kernel.org (mailing list archive)
State New, archived
Headers show
Series ceph: remove excess mutex locking from cap/snap flushing codepaths | expand

Commit Message

Jeff Layton June 15, 2021, 2:57 p.m. UTC
...to simplify some error paths.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
 fs/ceph/dir.c        | 3 +--
 fs/ceph/inode.c      | 6 ++----
 fs/ceph/mds_client.c | 6 ++++--
 fs/ceph/metric.c     | 3 +--
 4 files changed, 8 insertions(+), 10 deletions(-)

Comments

Luis Henriques June 16, 2021, 3:24 p.m. UTC | #1
On Tue, Jun 15, 2021 at 10:57:25AM -0400, Jeff Layton wrote:
> ...to simplify some error paths.
> 
> Signed-off-by: Jeff Layton <jlayton@kernel.org>
> ---
>  fs/ceph/dir.c        | 3 +--
>  fs/ceph/inode.c      | 6 ++----
>  fs/ceph/mds_client.c | 6 ++++--
>  fs/ceph/metric.c     | 3 +--
>  4 files changed, 8 insertions(+), 10 deletions(-)
> 
> diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
> index ac431246e0c9..0dc5f8357f58 100644
> --- a/fs/ceph/dir.c
> +++ b/fs/ceph/dir.c
> @@ -1802,8 +1802,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
> index df0c8a724609..6f43542b3344 100644
> --- 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
> index e5af591d3bd4..ec669634c649 100644
> --- 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
> index 9577c71e645d..5ac151eb0d49 100644
> --- 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)	\
> -- 
> 2.31.1
> 

LGTM, feel free to add my

Reviewed-by: Luis Henriques <lhenriques@suse.de>

Cheers,
--
Luís
diff mbox series

Patch

diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
index ac431246e0c9..0dc5f8357f58 100644
--- a/fs/ceph/dir.c
+++ b/fs/ceph/dir.c
@@ -1802,8 +1802,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
index df0c8a724609..6f43542b3344 100644
--- 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
index e5af591d3bd4..ec669634c649 100644
--- 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
index 9577c71e645d..5ac151eb0d49 100644
--- 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)	\