History

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: new helper: mount_subtree() switch create_mnt_ns() to saner calling conventions, fix double mntput() in nfs btrfs: fix double mntput() in mount_subvol()

Linus Torvalds committed 15 years ago

Commit 208f6f62 parents ab5c5f6 ea441d14 files · +43 −63Browse files

Unified · Split

4 files
  1. fs/btrfs/super.c +6 −32
  2. fs/namespace.c +30 −0
  3. fs/nfs/super.c +6 −31
  4. include/linux/fs.h +1 −0
fs/btrfs/super.c+6−32
@@ -825,13 +825,9 @@ static char *setup_root_args(char *args) · 824 unmodified lines
825825 static struct dentry *mount_subvol(const char *subvol_name, int flags,
826826 const char *device_name, char *data)
827827 {
828− struct super_block *s;
829828 struct dentry *root;
830829 struct vfsmount *mnt;
831− struct mnt_namespace *ns_private;
832830 char *newargs;
833− struct path path;
834− int error;
835831
836832 newargs = setup_root_args(data);
837833 if (!newargs)
@@ -842,39 +838,17 @@ static struct dentry *mount_subvol(const char *subvol_name, int flags, · 4 unmodified lines
842838 if (IS_ERR(mnt))
843839 return ERR_CAST(mnt);
844840
845− ns_private = create_mnt_ns(mnt);
846− if (IS_ERR(ns_private)) {
847− mntput(mnt);
848− return ERR_CAST(ns_private);
849− }
841+ root = mount_subtree(mnt, subvol_name);
850842
851− /*
852− * This will trigger the automount of the subvol so we can just
853− * drop the mnt we have here and return the dentry that we
854− * found.
855− */
856− error = vfs_path_lookup(mnt->mnt_root, mnt, subvol_name,
857− LOOKUP_FOLLOW, &path);
858− put_mnt_ns(ns_private);
859− if (error)
860− return ERR_PTR(error);
861−
862− if (!is_subvolume_inode(path.dentry->d_inode)) {
863− path_put(&path);
864− mntput(mnt);
865− error = -EINVAL;
843+ if (!IS_ERR(root) && !is_subvolume_inode(root->d_inode)) {
844+ struct super_block *s = root->d_sb;
845+ dput(root);
846+ root = ERR_PTR(-EINVAL);
847+ deactivate_locked_super(s);
866848 printk(KERN_ERR "btrfs: '%s' is not a valid subvolume\n",
867849 subvol_name);
868− return ERR_PTR(-EINVAL);
869850 }
870851
871− /* Get a ref to the sb and the dentry we found and return it */
872− s = path.mnt->mnt_sb;
873− atomic_inc(&s->s_active);
874− root = dget(path.dentry);
875− path_put(&path);
876− down_write(&s->s_umount);
877−
878852 return root;
879853 }
880854
fs/namespace.c+30−0
@@ -2483,11 +2483,41 @@ struct mnt_namespace *create_mnt_ns(struct vfsmount *mnt) · 2482 unmodified lines
24832483 __mnt_make_longterm(mnt);
24842484 new_ns->root = mnt;
24852485 list_add(&new_ns->list, &new_ns->root->mnt_list);
2486+ } else {
2487+ mntput(mnt);
24862488 }
24872489 return new_ns;
24882490 }
24892491 EXPORT_SYMBOL(create_mnt_ns);
24902492
2493+struct dentry *mount_subtree(struct vfsmount *mnt, const char *name)
2494+{
2495+ struct mnt_namespace *ns;
2496+ struct path path;
2497+ int err;
2498+
2499+ ns = create_mnt_ns(mnt);
2500+ if (IS_ERR(ns))
2501+ return ERR_CAST(ns);
2502+
2503+ err = vfs_path_lookup(mnt->mnt_root, mnt,
2504+ name, LOOKUP_FOLLOW|LOOKUP_AUTOMOUNT, &path);
2505+
2506+ put_mnt_ns(ns);
2507+
2508+ if (err)
2509+ return ERR_PTR(err);
2510+
2511+ /* trade a vfsmount reference for active sb one */
2512+ atomic_inc(&path.mnt->mnt_sb->s_active);
2513+ mntput(path.mnt);
2514+ /* lock the sucker */
2515+ down_write(&path.mnt->mnt_sb->s_umount);
2516+ /* ... and return the root of (sub)tree on it */
2517+ return path.dentry;
2518+}
2519+EXPORT_SYMBOL(mount_subtree);
2520+
24912521 SYSCALL_DEFINE5(mount, char __user *, dev_name, char __user *, dir_name,
24922522 char __user *, type, unsigned long, flags, void __user *, data)
24932523 {
fs/nfs/super.c+6−31
@@ -2787,43 +2787,18 @@ static void nfs_referral_loop_unprotect(void) · 2786 unmodified lines
27872787 static struct dentry *nfs_follow_remote_path(struct vfsmount *root_mnt,
27882788 const char *export_path)
27892789 {
2790− struct mnt_namespace *ns_private;
2791− struct super_block *s;
27922790 struct dentry *dentry;
2793− struct path path;
2794− int ret;
2795−
2796− ns_private = create_mnt_ns(root_mnt);
2797− ret = PTR_ERR(ns_private);
2798− if (IS_ERR(ns_private))
2799− goto out_mntput;
2800−
2801− ret = nfs_referral_loop_protect();
2802− if (ret != 0)
2803− goto out_put_mnt_ns;
2791+ int ret = nfs_referral_loop_protect();
28042792
2805− ret = vfs_path_lookup(root_mnt->mnt_root, root_mnt,
2806− export_path, LOOKUP_FOLLOW|LOOKUP_AUTOMOUNT, &path);
2793+ if (ret) {
2794+ mntput(root_mnt);
2795+ return ERR_PTR(ret);
2796+ }
28072797
2798+ dentry = mount_subtree(root_mnt, export_path);
28082799 nfs_referral_loop_unprotect();
2809− put_mnt_ns(ns_private);
2810−
2811− if (ret != 0)
2812− goto out_err;
2813−
2814− s = path.mnt->mnt_sb;
2815− atomic_inc(&s->s_active);
2816− dentry = dget(path.dentry);
28172800
2818− path_put(&path);
2819− down_write(&s->s_umount);
28202801 return dentry;
2821−out_put_mnt_ns:
2822− put_mnt_ns(ns_private);
2823−out_mntput:
2824− mntput(root_mnt);
2825−out_err:
2826− return ERR_PTR(ret);
28272802 }
28282803
28292804 static struct dentry *nfs4_try_mount(int flags, const char *dev_name,
include/linux/fs.h+1−0
@@ -1886,6 +1886,7 @@ extern struct dentry *mount_single(struct file_system_type *fs_type, · 1885 unmodified lines
18861886 extern struct dentry *mount_nodev(struct file_system_type *fs_type,
18871887 int flags, void *data,
18881888 int (*fill_super)(struct super_block *, void *, int));
1889+extern struct dentry *mount_subtree(struct vfsmount *mnt, const char *path);
18891890 void generic_shutdown_super(struct super_block *sb);
18901891 void kill_block_super(struct super_block *sb);
18911892 void kill_anon_super(struct super_block *sb);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t