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

Commit c362781c authored by Jeff Layton's avatar Jeff Layton Committed by Jeff Layton
Browse files

ceph: move spinlocking into ceph_encode_locks_to_buffer and ceph_count_locks 



There is only a single call site for each of these functions, and the
caller takes the i_lock prior to calling them and drops it just
afterward. Move the spinlocking into the functions instead.

Signed-off-by: default avatarJeff Layton <jlayton@primarydata.com>
Acked-by: default avatarChristoph Hellwig <hch@lst.de>
parent 4a075e39

fs/ceph/locks.c

+4 −0
Original line number Diff line number Diff line
@@ -251,12 +251,14 @@ void ceph_count_locks(struct inode *inode, int *fcntl_count, int *flock_count) 
	*fcntl_count = 0;

	*flock_count = 0;



	spin_lock(&inode->i_lock);

	for (lock = inode->i_flock; lock != NULL; lock = lock->fl_next) {

		if (lock->fl_flags & FL_POSIX)

			++(*fcntl_count);

		else if (lock->fl_flags & FL_FLOCK)

			++(*flock_count);

	}

	spin_unlock(&inode->i_lock);

	dout("counted %d flock locks and %d fcntl locks",

	     *flock_count, *fcntl_count);

}
@@ -279,6 +281,7 @@ int ceph_encode_locks_to_buffer(struct inode *inode, 
	dout("encoding %d flock and %d fcntl locks", num_flock_locks,

	     num_fcntl_locks);



	spin_lock(&inode->i_lock);

	for (lock = inode->i_flock; lock != NULL; lock = lock->fl_next) {

		if (lock->fl_flags & FL_POSIX) {

			++seen_fcntl;
@@ -306,6 +309,7 @@ int ceph_encode_locks_to_buffer(struct inode *inode, 
		}

	}

fail:

	spin_unlock(&inode->i_lock);

	return err;

}

fs/ceph/mds_client.c

+0 −4
Original line number Diff line number Diff line
@@ -2700,20 +2700,16 @@ static int encode_caps_cb(struct inode *inode, struct ceph_cap *cap, 
		struct ceph_filelock *flocks;



encode_again:

		spin_lock(&inode->i_lock);

		ceph_count_locks(inode, &num_fcntl_locks, &num_flock_locks);

		spin_unlock(&inode->i_lock);

		flocks = kmalloc((num_fcntl_locks+num_flock_locks) *

				 sizeof(struct ceph_filelock), GFP_NOFS);

		if (!flocks) {

			err = -ENOMEM;

			goto out_free;

		}

		spin_lock(&inode->i_lock);

		err = ceph_encode_locks_to_buffer(inode, flocks,

						  num_fcntl_locks,

						  num_flock_locks);

		spin_unlock(&inode->i_lock);

		if (err) {

			kfree(flocks);

			if (err == -ENOSPC)