Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[net-next-2.6.git] / fs / locks.c

diff --git a/fs/locks.c b/fs/locks.c
index 2eb81975c99c7ee2c247cf6c7aa11e348bb1e3fc..19ee18a6829b9ae443778d63d57a8d8924131748 100644 (file)
--- a/fs/locks.c
+++ b/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;