CIFS shouldn't make mountpoints shrinkable
authorAl Viro <viro@zeniv.linux.org.uk>
Sat, 16 Jan 2010 18:06:32 +0000 (13:06 -0500)
committerAl Viro <viro@zeniv.linux.org.uk>
Sat, 16 Jan 2010 18:06:32 +0000 (13:06 -0500)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/cifs/cifs_dfs_ref.c

index fea9e898c4ba52ef453eda892115908f0290d2d9..b44ce0a0711c9d4bb98670d82ee45d14bf192093 100644 (file)
@@ -269,7 +269,7 @@ static int add_mount_helper(struct vfsmount *newmnt, struct nameidata *nd,
        int err;
 
        mntget(newmnt);
-       err = do_add_mount(newmnt, &nd->path, nd->path.mnt->mnt_flags, mntlist);
+       err = do_add_mount(newmnt, &nd->path, nd->path.mnt->mnt_flags | MNT_SHRINKABLE, mntlist);
        switch (err) {
        case 0:
                path_put(&nd->path);
@@ -371,7 +371,6 @@ cifs_dfs_follow_mountpoint(struct dentry *dentry, struct nameidata *nd)
        if (IS_ERR(mnt))
                goto out_err;
 
-       nd->path.mnt->mnt_flags |= MNT_SHRINKABLE;
        rc = add_mount_helper(mnt, nd, &cifs_dfs_automount_list);
 
 out: