---

yaml --- r: 157312 b: refs/heads/master c: 713c0ec h: refs/heads/master v: v3
git-mirror · Jul 16, 2009 · 6821afe · 6821afe
1 parent a73562f
commit 6821afe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d45ecafb6792ca68da9517969d37d910601845f
+refs/heads/master: 713c0ecdb888e9ef6f085e828555455c5916b07f
diff --git a/trunk/fs/locks.c b/trunk/fs/locks.c
@@ -1591,7 +1591,7 @@ SYSCALL_DEFINE2(flock, unsigned int, fd, unsigned int, cmd)
 	if (can_sleep)
 		lock->fl_flags |= FL_SLEEP;
 
-	error = security_file_lock(filp, cmd);
+	error = security_file_lock(filp, lock->fl_type);
 	if (error)
 		goto out_free;