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;