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

[karo-tx-linux.git] / fs / file_table.c

diff --git a/fs/file_table.c b/fs/file_table.c
index 468543c1973dec959ff2fa1aff3c7fea684f5054..01071c4d752e1e41099c8082a31a55305c5c647d 100644 (file)
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -135,6 +135,7 @@ struct file *get_empty_filp(void)
        atomic_long_set(&f->f_count, 1);
        rwlock_init(&f->f_owner.lock);
        spin_lock_init(&f->f_lock);
+       mutex_init(&f->f_pos_lock);
        eventpoll_init_file(f);
        /* f->f_version: 0 */
        return f;