3 files changed, 33 insertions, 37 deletions

diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index f5013d92a7e6..c81c0e004588 100644
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
@@ -1416,7 +1416,7 @@ void ceph_fill_inline_data(struct inode *inode, struct page *locked_page,
                 }
         }
 
-        dout("fill_inline_data %p %llx.%llx len %lu locked_page %p\n",
+        dout("fill_inline_data %p %llx.%llx len %zu locked_page %p\n",
              inode, ceph_vinop(inode), len, locked_page);
 
         if (len > 0) {
diff --git a/fs/ceph/locks.c b/fs/ceph/locks.c
index c35c5c614e38..06ea5cd05cd9 100644
--- a/fs/ceph/locks.c
+++ b/fs/ceph/locks.c
@@ -239,23 +239,21 @@ int ceph_flock(struct file *file, int cmd, struct file_lock *fl)
         return err;
 }
 
-/**
- * Must be called with lock_flocks() already held. Fills in the passed
- * counter variables, so you can prepare pagelist metadata before calling
- * ceph_encode_locks.
+/*
+ * Fills in the passed counter variables, so you can prepare pagelist metadata
+ * before calling ceph_encode_locks.
  */
 void ceph_count_locks(struct inode *inode, int *fcntl_count, int *flock_count)
 {
-        struct file_lock *lock;
+        struct file_lock_context *ctx;
 
         *fcntl_count = 0;
         *flock_count = 0;
 
-        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);
+        ctx = inode->i_flctx;
+        if (ctx) {
+                *fcntl_count = ctx->flc_posix_cnt;
+                *flock_count = ctx->flc_flock_cnt;
         }
         dout("counted %d flock locks and %d fcntl locks",
              *flock_count, *fcntl_count);
@@ -271,6 +269,7 @@ int ceph_encode_locks_to_buffer(struct inode *inode,
                                 int num_fcntl_locks, int num_flock_locks)
 {
         struct file_lock *lock;
+        struct file_lock_context *ctx = inode->i_flctx;
         int err = 0;
         int seen_fcntl = 0;
         int seen_flock = 0;
@@ -279,33 +278,34 @@ int ceph_encode_locks_to_buffer(struct inode *inode,
         dout("encoding %d flock and %d fcntl locks", num_flock_locks,
              num_fcntl_locks);
 
-        for (lock = inode->i_flock; lock != NULL; lock = lock->fl_next) {
-                if (lock->fl_flags & FL_POSIX) {
-                        ++seen_fcntl;
-                        if (seen_fcntl > num_fcntl_locks) {
-                                err = -ENOSPC;
-                                goto fail;
-                        }
-                        err = lock_to_ceph_filelock(lock, &flocks[l]);
-                        if (err)
-                                goto fail;
-                        ++l;
+        if (!ctx)
+                return 0;
+
+        spin_lock(&ctx->flc_lock);
+        list_for_each_entry(lock, &ctx->flc_flock, fl_list) {
+                ++seen_fcntl;
+                if (seen_fcntl > num_fcntl_locks) {
+                        err = -ENOSPC;
+                        goto fail;
                 }
+                err = lock_to_ceph_filelock(lock, &flocks[l]);
+                if (err)
+                        goto fail;
+                ++l;
         }
-        for (lock = inode->i_flock; lock != NULL; lock = lock->fl_next) {
-                if (lock->fl_flags & FL_FLOCK) {
-                        ++seen_flock;
-                        if (seen_flock > num_flock_locks) {
-                                err = -ENOSPC;
-                                goto fail;
-                        }
-                        err = lock_to_ceph_filelock(lock, &flocks[l]);
-                        if (err)
-                                goto fail;
-                        ++l;
+        list_for_each_entry(lock, &ctx->flc_flock, fl_list) {
+                ++seen_flock;
+                if (seen_flock > num_flock_locks) {
+                        err = -ENOSPC;
+                        goto fail;
                 }
+                err = lock_to_ceph_filelock(lock, &flocks[l]);
+                if (err)
+                        goto fail;
+                ++l;
         }
 fail:
+        spin_unlock(&ctx->flc_lock);
         return err;
 }
 
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index d2171f4a6980..5f62fb7a5d0a 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -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)