Merge branch 'work.sane_pwd' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[sfrench/cifs-2.6.git] / fs / namespace.c

diff --git a/fs/namespace.c b/fs/namespace.c
index 0886ef28bff6e0241ad8809bcaae3beffa268590..8bd3e4d448b9f07a8aa148c8d08c092f45471a7c 100644 (file)
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -236,9 +236,6 @@ static struct mount *alloc_vfsmnt(const char *name)
                INIT_LIST_HEAD(&mnt->mnt_slave_list);
                INIT_LIST_HEAD(&mnt->mnt_slave);
                INIT_HLIST_NODE(&mnt->mnt_mp_list);
-#ifdef CONFIG_FSNOTIFY
-               INIT_HLIST_HEAD(&mnt->mnt_fsnotify_marks);
-#endif
                init_fs_pin(&mnt->mnt_umount, drop_mountpoint);
        }
        return mnt;