diff --git a/[refs] b/[refs] index 0f8c7265746f..5f8cb883cbed 100644 --- 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 index b6440f52178f..52366e877d76 100644 --- 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;