Browse Source

CIFS shouldn't make mountpoints shrinkable

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Al Viro 15 years ago
parent
commit
7e1295d9f8
1 changed files with 1 additions and 2 deletions
  1. 1 2
      fs/cifs/cifs_dfs_ref.c

+ 1 - 2
fs/cifs/cifs_dfs_ref.c

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