Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d8c232a authored by Jeff Layton's avatar Jeff Layton Committed by Greg Kroah-Hartman
Browse files

ceph: add some lockdep assertions around snaprealm handling 



commit a6862e6708c15995bc10614b2ef34ca35b4b9078 upstream.

Turn some comments into lockdep asserts.

Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Reviewed-by: default avatarIlya Dryomov <idryomov@gmail.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a6ff0f3f

fs/ceph/snap.c

+16 −0
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ 
void ceph_get_snap_realm(struct ceph_mds_client *mdsc,

			 struct ceph_snap_realm *realm)

{

	lockdep_assert_held_write(&mdsc->snap_rwsem);



	dout("get_realm %p %d -> %d\n", realm,

	     atomic_read(&realm->nref), atomic_read(&realm->nref)+1);

	/*
@@ -113,6 +115,8 @@ static struct ceph_snap_realm *ceph_create_snap_realm( 
{

	struct ceph_snap_realm *realm;



	lockdep_assert_held_write(&mdsc->snap_rwsem);



	realm = kzalloc(sizeof(*realm), GFP_NOFS);

	if (!realm)

		return ERR_PTR(-ENOMEM);
@@ -143,6 +147,8 @@ static struct ceph_snap_realm *__lookup_snap_realm(struct ceph_mds_client *mdsc, 
	struct rb_node *n = mdsc->snap_realms.rb_node;

	struct ceph_snap_realm *r;



	lockdep_assert_held_write(&mdsc->snap_rwsem);



	while (n) {

		r = rb_entry(n, struct ceph_snap_realm, node);

		if (ino < r->ino)
@@ -176,6 +182,8 @@ static void __put_snap_realm(struct ceph_mds_client *mdsc, 
static void __destroy_snap_realm(struct ceph_mds_client *mdsc,

				 struct ceph_snap_realm *realm)

{

	lockdep_assert_held_write(&mdsc->snap_rwsem);



	dout("__destroy_snap_realm %p %llx\n", realm, realm->ino);



	rb_erase(&realm->node, &mdsc->snap_realms);
@@ -198,6 +206,8 @@ static void __destroy_snap_realm(struct ceph_mds_client *mdsc, 
static void __put_snap_realm(struct ceph_mds_client *mdsc,

			     struct ceph_snap_realm *realm)

{

	lockdep_assert_held_write(&mdsc->snap_rwsem);



	dout("__put_snap_realm %llx %p %d -> %d\n", realm->ino, realm,

	     atomic_read(&realm->nref), atomic_read(&realm->nref)-1);

	if (atomic_dec_and_test(&realm->nref))
@@ -236,6 +246,8 @@ static void __cleanup_empty_realms(struct ceph_mds_client *mdsc) 
{

	struct ceph_snap_realm *realm;



	lockdep_assert_held_write(&mdsc->snap_rwsem);



	spin_lock(&mdsc->snap_empty_lock);

	while (!list_empty(&mdsc->snap_empty)) {

		realm = list_first_entry(&mdsc->snap_empty,
@@ -269,6 +281,8 @@ static int adjust_snap_realm_parent(struct ceph_mds_client *mdsc, 
{

	struct ceph_snap_realm *parent;



	lockdep_assert_held_write(&mdsc->snap_rwsem);



	if (realm->parent_ino == parentino)

		return 0;
@@ -686,6 +700,8 @@ int ceph_update_snap_trace(struct ceph_mds_client *mdsc, 
	int err = -ENOMEM;

	LIST_HEAD(dirty_realms);



	lockdep_assert_held_write(&mdsc->snap_rwsem);



	dout("update_snap_trace deletion=%d\n", deletion);

more:

	ceph_decode_need(&p, e, sizeof(*ri), bad);