Commit 5ed91587 authored by Xiubo Li's avatar Xiubo Li Committed by Ilya Dryomov
Browse files

ceph: do not release the global snaprealm until unmounting 

The global snaprealm would be created and then destroyed immediately
every time when updating it.

URL: https://tracker.ceph.com/issues/54362


Signed-off-by: default avatarXiubo Li <xiubli@redhat.com>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 1753629e

fs/ceph/mds_client.c

+1 −1
Original line number Diff line number Diff line
@@ -4838,7 +4838,7 @@ void ceph_mdsc_close_sessions(struct ceph_mds_client *mdsc) 
	mutex_unlock(&mdsc->mutex);



	ceph_cleanup_snapid_map(mdsc);

	ceph_cleanup_empty_realms(mdsc);

	ceph_cleanup_global_and_empty_realms(mdsc);



	cancel_work_sync(&mdsc->cap_reclaim_work);

	cancel_delayed_work_sync(&mdsc->delayed_work); /* cancel timer */

fs/ceph/snap.c

+11 −2
Original line number Diff line number Diff line
@@ -121,7 +121,11 @@ static struct ceph_snap_realm *ceph_create_snap_realm( 
	if (!realm)

		return ERR_PTR(-ENOMEM);



	atomic_set(&realm->nref, 1);    /* for caller */

	/* Do not release the global dummy snaprealm until unmouting */

	if (ino == CEPH_INO_GLOBAL_SNAPREALM)

		atomic_set(&realm->nref, 2);

	else

		atomic_set(&realm->nref, 1);

	realm->ino = ino;

	INIT_LIST_HEAD(&realm->children);

	INIT_LIST_HEAD(&realm->child_item);
@@ -261,9 +265,14 @@ static void __cleanup_empty_realms(struct ceph_mds_client *mdsc) 
	spin_unlock(&mdsc->snap_empty_lock);

}



void ceph_cleanup_empty_realms(struct ceph_mds_client *mdsc)

void ceph_cleanup_global_and_empty_realms(struct ceph_mds_client *mdsc)

{

	struct ceph_snap_realm *global_realm;



	down_write(&mdsc->snap_rwsem);

	global_realm = __lookup_snap_realm(mdsc, CEPH_INO_GLOBAL_SNAPREALM);

	if (global_realm)

		ceph_put_snap_realm(mdsc, global_realm);

	__cleanup_empty_realms(mdsc);

	up_write(&mdsc->snap_rwsem);

}

fs/ceph/super.h

+1 −1
Original line number Diff line number Diff line
@@ -940,7 +940,7 @@ extern void ceph_handle_snap(struct ceph_mds_client *mdsc, 
			     struct ceph_msg *msg);

extern int __ceph_finish_cap_snap(struct ceph_inode_info *ci,

				  struct ceph_cap_snap *capsnap);

extern void ceph_cleanup_empty_realms(struct ceph_mds_client *mdsc);

extern void ceph_cleanup_global_and_empty_realms(struct ceph_mds_client *mdsc);



extern struct ceph_snapid_map *ceph_get_snapid_map(struct ceph_mds_client *mdsc,

						   u64 snap);

include/linux/ceph/ceph_fs.h

+2 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 


#define CEPH_INO_ROOT   1

#define CEPH_INO_CEPH   2            /* hidden .ceph dir */

#define CEPH_INO_GLOBAL_SNAPREALM  3 /* global dummy snaprealm */



/* arbitrary limit on max # of monitors (cluster of 3 is typical) */

#define CEPH_MAX_MON   31