1 files changed, 11 insertions, 7 deletions

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index c06a1ba80d73..fad821991369 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -5556,10 +5556,11 @@ out_nfserr:
 static bool
 check_for_locks(struct nfs4_file *fp, struct nfs4_lockowner *lowner)
 {
-        struct file_lock **flpp;
+        struct file_lock *fl;
         int status = false;
         struct file *filp = find_any_file(fp);
         struct inode *inode;
+        struct file_lock_context *flctx;
 
         if (!filp) {
                 /* Any valid lock stateid should have some sort of access */
@@ -5568,15 +5569,18 @@ check_for_locks(struct nfs4_file *fp, struct nfs4_lockowner *lowner)
         }
 
         inode = file_inode(filp);
+        flctx = inode->i_flctx;
 
-        spin_lock(&inode->i_lock);
-        for (flpp = &inode->i_flock; *flpp != NULL; flpp = &(*flpp)->fl_next) {
-                if ((*flpp)->fl_owner == (fl_owner_t)lowner) {
-                        status = true;
-                        break;
+        if (flctx && !list_empty_careful(&flctx->flc_posix)) {
+                spin_lock(&inode->i_lock);
+                list_for_each_entry(fl, &flctx->flc_posix, fl_list) {
+                        if (fl->fl_owner == (fl_owner_t)lowner) {
+                                status = true;
+                                break;
+                        }
                 }
+                spin_unlock(&inode->i_lock);
         }
-        spin_unlock(&inode->i_lock);
         fput(filp);
         return status;
 }