2.6.24.5-rc2

 fs

diff --git a/fs/locks.c b/fs/locks.c
index 8b8388e..2fd29d9 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -1805,17 +1805,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;
+      }
    }
 
    /*
@@ -1929,17 +1933,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;
+      }
    }
 
    /*