xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ceph: allow ceph_put_mds_session to take NULL or ERR_PTR

Browse Source 
[ Upstream commit 7e65624d32b6e0429b1d3559e5585657f34f74a1 ]

...to simplify some error paths.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: Luis Henriques <lhenriques@suse.de>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Jeff Layton
2021-06-09 14:09:52 -04:00
committed by Greg Kroah-Hartman
parent 41aa215734
commit 8193ad306e
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fs/ceph/dir.c
View File

@@ -1797,7 +1797,6 @@ static void ceph_d_release(struct dentry *dentry)
dentry->d_fsdata = NULL; dentry->d_fsdata = NULL;
spin_unlock(&dentry->d_lock); 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); kmem_cache_free(ceph_dentry_cachep, di);
} }

2
fs/ceph/inode.c
View File

@@ -1121,7 +1121,6 @@ static inline void update_dentry_lease(struct inode *dir, struct dentry *dentry,
__update_dentry_lease(dir, dentry, lease, session, from_time, __update_dentry_lease(dir, dentry, lease, session, from_time,
&old_lease_session); &old_lease_session);
spin_unlock(&dentry->d_lock); spin_unlock(&dentry->d_lock);
if (old_lease_session)
ceph_put_mds_session(old_lease_session); ceph_put_mds_session(old_lease_session);
} }
@@ -1167,7 +1166,6 @@ static void update_dentry_lease_careful(struct dentry *dentry,
from_time, &old_lease_session); from_time, &old_lease_session);
out_unlock: out_unlock:
spin_unlock(&dentry->d_lock); spin_unlock(&dentry->d_lock);
if (old_lease_session)
ceph_put_mds_session(old_lease_session); ceph_put_mds_session(old_lease_session);
} }

4
fs/ceph/mds_client.c
View File

@@ -661,6 +661,9 @@ struct ceph_mds_session *ceph_get_mds_session(struct ceph_mds_session *s)
void ceph_put_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, dout("mdsc put_session %p %d -> %d\n", s,
refcount_read(&s->s_ref), refcount_read(&s->s_ref)-1); refcount_read(&s->s_ref), refcount_read(&s->s_ref)-1);
if (refcount_dec_and_test(&s->s_ref)) { if (refcount_dec_and_test(&s->s_ref)) {
@@ -1435,7 +1438,6 @@ static void __open_export_target_sessions(struct ceph_mds_client *mdsc,
for (i = 0; i < mi->num_export_targets; i++) { for (i = 0; i < mi->num_export_targets; i++) {
ts = __open_export_target_session(mdsc, mi->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);
} }
} }

1
fs/ceph/metric.c
View File

@@ -233,7 +233,6 @@ void ceph_metric_destroy(struct ceph_client_metric *m)
cancel_delayed_work_sync(&m->delayed_work); cancel_delayed_work_sync(&m->delayed_work);
if (m->session)
ceph_put_mds_session(m->session); ceph_put_mds_session(m->session);
} }