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

[linux.git] / fs / file_table.c

diff --git a/fs/file_table.c b/fs/file_table.c
index 718e8e5224f8fd0652f4ded2d9c99db83c31ed48..a374f5033e97bab814977f8375f5c8cb1c899228 100644 (file)
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -199,7 +199,7 @@ static void __fput(struct file *file)
         * in the file cleanup chain.
         */
        eventpoll_release(file);
-       locks_remove_flock(file);
+       locks_remove_file(file);
 
        if (unlikely(file->f_flags & FASYNC)) {
                if (file->f_op->fasync)