locks: add a dedicated spinlock to protect i_flctx lists

We can now add a dedicated spinlock without expanding struct inode.
Change to using that to protect the various i_flctx lists.

Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Acked-by: Christoph Hellwig <hch@lst.de>

3 files changed, 10 insertions, 10 deletions

diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c
index 3fb1caa3874d..8cdb2b28a104 100644
--- a/fs/nfs/delegation.c
+++ b/fs/nfs/delegation.c
@@ -93,22 +93,22 @@ static int nfs_delegation_claim_locks(struct nfs_open_context *ctx, struct nfs4_
                 goto out;
 
         list = &flctx->flc_posix;
-        spin_lock(&inode->i_lock);
+        spin_lock(&flctx->flc_lock);
 restart:
         list_for_each_entry(fl, list, fl_list) {
                 if (nfs_file_open_context(fl->fl_file) != ctx)
                         continue;
-                spin_unlock(&inode->i_lock);
+                spin_unlock(&flctx->flc_lock);
                 status = nfs4_lock_delegation_recall(fl, state, stateid);
                 if (status < 0)
                         goto out;
-                spin_lock(&inode->i_lock);
+                spin_lock(&flctx->flc_lock);
         }
         if (list == &flctx->flc_posix) {
                 list = &flctx->flc_flock;
                 goto restart;
         }
-        spin_unlock(&inode->i_lock);
+        spin_unlock(&flctx->flc_lock);
 out:
         return status;
 }
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 6084c267f3a0..a3bb22ab68c5 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -1376,12 +1376,12 @@ static int nfs4_reclaim_locks(struct nfs4_state *state, const struct nfs4_state_
 
         /* Guard against delegation returns and new lock/unlock calls */
         down_write(&nfsi->rwsem);
-        spin_lock(&inode->i_lock);
+        spin_lock(&flctx->flc_lock);
 restart:
         list_for_each_entry(fl, list, fl_list) {
                 if (nfs_file_open_context(fl->fl_file)->state != state)
                         continue;
-                spin_unlock(&inode->i_lock);
+                spin_unlock(&flctx->flc_lock);
                 status = ops->recover_lock(state, fl);
                 switch (status) {
                 case 0:
@@ -1408,13 +1408,13 @@ restart:
                         /* kill_proc(fl->fl_pid, SIGLOST, 1); */
                         status = 0;
                 }
-                spin_lock(&inode->i_lock);
+                spin_lock(&flctx->flc_lock);
         }
         if (list == &flctx->flc_posix) {
                 list = &flctx->flc_flock;
                 goto restart;
         }
-        spin_unlock(&inode->i_lock);
+        spin_unlock(&flctx->flc_lock);
 out:
         up_write(&nfsi->rwsem);
         return status;
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 784c13485b3f..4ae66f416eb9 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -1206,7 +1206,7 @@ static int nfs_can_extend_write(struct file *file, struct page *page, struct ino
 
         /* Check to see if there are whole file write locks */
         ret = 0;
-        spin_lock(&inode->i_lock);
+        spin_lock(&flctx->flc_lock);
         if (!list_empty(&flctx->flc_posix)) {
                 fl = list_first_entry(&flctx->flc_posix, struct file_lock,
                                         fl_list);
@@ -1218,7 +1218,7 @@ static int nfs_can_extend_write(struct file *file, struct page *page, struct ino
                 if (fl->fl_type == F_WRLCK)
                         ret = 1;
         }
-        spin_unlock(&inode->i_lock);
+        spin_unlock(&flctx->flc_lock);
         return ret;
 }