1 files changed, 28 insertions, 20 deletions

diff --git a/fs/locks.c b/fs/locks.c
index d83fab1b77b5..43c0af21a0c5 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -1801,17 +1801,21 @@ again:
         if (error)
                 goto out;
 
-        for (;;) {
-                error = vfs_lock_file(filp, cmd, file_lock, NULL);
-                if (error != -EAGAIN || cmd == F_SETLK)
-                        break;
-                error = wait_event_interruptible(file_lock->fl_wait,
-                                !file_lock->fl_next);
-                if (!error)
-                        continue;
+        if (filp->f_op && filp->f_op->lock != NULL)
+                error = filp->f_op->lock(filp, cmd, file_lock);
+        else {
+                for (;;) {
+                        error = posix_lock_file(filp, file_lock, NULL);
+                        if (error != -EAGAIN || cmd == F_SETLK)
+                                break;
+                        error = wait_event_interruptible(file_lock->fl_wait,
+                                        !file_lock->fl_next);
+                        if (!error)
+                                continue;
 
-                locks_delete_block(file_lock);
-                break;
+                        locks_delete_block(file_lock);
+                        break;
+                }
         }
 
         /*
@@ -1925,17 +1929,21 @@ again:
         if (error)
                 goto out;
 
-        for (;;) {
-                error = vfs_lock_file(filp, cmd, file_lock, NULL);
-                if (error != -EAGAIN || cmd == F_SETLK64)
-                        break;
-                error = wait_event_interruptible(file_lock->fl_wait,
-                                !file_lock->fl_next);
-                if (!error)
-                        continue;
+        if (filp->f_op && filp->f_op->lock != NULL)
+                error = filp->f_op->lock(filp, cmd, file_lock);
+        else {
+                for (;;) {
+                        error = posix_lock_file(filp, file_lock, NULL);
+                        if (error != -EAGAIN || cmd == F_SETLK64)
+                                break;
+                        error = wait_event_interruptible(file_lock->fl_wait,
+                                        !file_lock->fl_next);
+                        if (!error)
+                                continue;
 
-                locks_delete_block(file_lock);
-                break;
+                        locks_delete_block(file_lock);
+                        break;
+                }
         }
 
         /*