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: Jeff Layton <jlayton@primarydata.com>
Acked-by: Christoph Hellwig <hch@lst.de>

1 files changed, 4 insertions, 0 deletions

diff --git a/fs/ceph/locks.c b/fs/ceph/locks.c
index c35c5c614e38..366dc2412605 100644
--- a/fs/ceph/locks.c
+++ b/fs/ceph/locks.c
@@ -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;
 }