From 0b873124278d06bf9d3f396faf7b81b661068d9a Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Tue, 11 Sep 2007 15:24:01 -0700
Subject: [PATCH] --- yaml --- r: 64878 b: refs/heads/master c:
 0e2f6db88a6900bc9db576d6b478b12ee60d61f7 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f5c91b11d0f8..8c8941ec3d19 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4740622c5c805d88c63a50747a2d05537dd233cf
+refs/heads/master: 0e2f6db88a6900bc9db576d6b478b12ee60d61f7
diff --git a/trunk/fs/locks.c b/trunk/fs/locks.c
index 50857d2d3404..c795eaaf6c4c 100644
--- a/trunk/fs/locks.c
+++ b/trunk/fs/locks.c
@@ -782,7 +782,7 @@ static int flock_lock_file(struct file *filp, struct file_lock *request)
 	if (request->fl_flags & FL_ACCESS)
 		goto out;
 	locks_copy_lock(new_fl, request);
-	locks_insert_lock(&inode->i_flock, new_fl);
+	locks_insert_lock(before, new_fl);
 	new_fl = NULL;
 	error = 0;