From edded0fc40d9c4a657ff4bde56af83de801055e9 Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <mszeredi@suse.cz>
Date: Fri, 25 Jul 2008 01:48:58 -0700
Subject: [PATCH] --- yaml --- r: 106036 b: refs/heads/master c:
 764c76b371722e0cba5c24d91225f0f954b69d44 h: refs/heads/master v: v3

---
 [refs]           |  2 +-
 trunk/fs/locks.c | 23 +++++++++--------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index ccb9ba4664ce..d1d97b2a97cc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b648a6de00770cc325c22f43bdd4e935f6a2ee55
+refs/heads/master: 764c76b371722e0cba5c24d91225f0f954b69d44
diff --git a/trunk/fs/locks.c b/trunk/fs/locks.c
index 6222e4b580e2..01490300f7cb 100644
--- a/trunk/fs/locks.c
+++ b/trunk/fs/locks.c
@@ -1747,21 +1747,16 @@ static int do_lock_file_wait(struct file *filp, unsigned int cmd,
 	if (error)
 		return error;
 
-	if (filp->f_op && filp->f_op->lock != NULL)
-		error = filp->f_op->lock(filp, cmd, fl);
-	else {
-		for (;;) {
-			error = posix_lock_file(filp, fl, NULL);
-			if (error != FILE_LOCK_DEFERRED)
-				break;
-			error = wait_event_interruptible(fl->fl_wait,
-							 !fl->fl_next);
-			if (!error)
-				continue;
-
-			locks_delete_block(fl);
+	for (;;) {
+		error = vfs_lock_file(filp, cmd, fl, NULL);
+		if (error != FILE_LOCK_DEFERRED)
 			break;
-		}
+		error = wait_event_interruptible(fl->fl_wait, !fl->fl_next);
+		if (!error)
+			continue;
+
+		locks_delete_block(fl);
+		break;
 	}
 
 	return error;