Merge branch 'locks-3.15' of git://git.samba.org/jlayton/linux

[linux-2.6-block.git] / fs / namei.c

diff --git a/fs/namei.c b/fs/namei.c
index c1178880f23c982bbba878c0e98c66243d1d91da..88339f59efb5d9b3691f5ebbad7e5ef6eb59c4db 100644 (file)
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2569,7 +2569,7 @@ static int handle_truncate(struct file *filp)
        /*
         * Refuse to truncate files with mandatory locks held on them.
         */
-       error = locks_verify_locked(inode);
+       error = locks_verify_locked(filp);
        if (!error)
                error = security_path_truncate(path);
        if (!error) {