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
825static struct dentry *mount_subvol(const char *subvol_name, int flags,825static struct dentry *mount_subvol(const char *subvol_name, int flags,
826 const char *device_name, char *data)826 const char *device_name, char *data)
827{827{
828 struct super_block *s;
829 struct dentry *root;828 struct dentry *root;
830 struct vfsmount *mnt;829 struct vfsmount *mnt;
831 struct mnt_namespace *ns_private;
832 char *newargs;830 char *newargs;
833 struct path path;
834 int error;
835 831
836 newargs = setup_root_args(data);832 newargs = setup_root_args(data);
837 if (!newargs)833 if (!newargs)
@@ -842,39 +838,17 @@ static struct dentry *mount_subvol(const char *subvol_name, int flags, · 4 unmodified lines
842 if (IS_ERR(mnt))838 if (IS_ERR(mnt))
843 return ERR_CAST(mnt);839 return ERR_CAST(mnt);
844 840
845 ns_private = create_mnt_ns(mnt);841 root = mount_subtree(mnt, subvol_name);
846 if (IS_ERR(ns_private)) {
847 mntput(mnt);
848 return ERR_CAST(ns_private);
849 }
850 842
851 /*843 if (!IS_ERR(root) && !is_subvolume_inode(root->d_inode)) {
852 * This will trigger the automount of the subvol so we can just844 struct super_block *s = root->d_sb;
853 * drop the mnt we have here and return the dentry that we845 dput(root);
854 * found.846 root = ERR_PTR(-EINVAL);
855 */847 deactivate_locked_super(s);
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;
866 printk(KERN_ERR "btrfs: '%s' is not a valid subvolume\n",848 printk(KERN_ERR "btrfs: '%s' is not a valid subvolume\n",
867 subvol_name);849 subvol_name);
868 return ERR_PTR(-EINVAL);
869 }850 }
870 851
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
878 return root;852 return root;
879}853}
880 854
fs/namespace.c+30−0
@@ -2483,11 +2483,41 @@ struct mnt_namespace *create_mnt_ns(struct vfsmount *mnt) · 2482 unmodified lines
2483 __mnt_make_longterm(mnt);2483 __mnt_make_longterm(mnt);
2484 new_ns->root = mnt;2484 new_ns->root = mnt;
2485 list_add(&new_ns->list, &new_ns->root->mnt_list);2485 list_add(&new_ns->list, &new_ns->root->mnt_list);
2486 } else {
2487 mntput(mnt);
2486 }2488 }
2487 return new_ns;2489 return new_ns;
2488}2490}
2489EXPORT_SYMBOL(create_mnt_ns);2491EXPORT_SYMBOL(create_mnt_ns);
2490 2492
2493struct 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}
2519EXPORT_SYMBOL(mount_subtree);
2520
2491SYSCALL_DEFINE5(mount, char __user *, dev_name, char __user *, dir_name,2521SYSCALL_DEFINE5(mount, char __user *, dev_name, char __user *, dir_name,
2492 char __user *, type, unsigned long, flags, void __user *, data)2522 char __user *, type, unsigned long, flags, void __user *, data)
2493{2523{
fs/nfs/super.c+6−31
@@ -2787,43 +2787,18 @@ static void nfs_referral_loop_unprotect(void) · 2786 unmodified lines
2787static struct dentry *nfs_follow_remote_path(struct vfsmount *root_mnt,2787static struct dentry *nfs_follow_remote_path(struct vfsmount *root_mnt,
2788 const char *export_path)2788 const char *export_path)
2789{2789{
2790 struct mnt_namespace *ns_private;
2791 struct super_block *s;
2792 struct dentry *dentry;2790 struct dentry *dentry;
2793 struct path path;2791 int ret = nfs_referral_loop_protect();
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;
2804 2792
2805 ret = vfs_path_lookup(root_mnt->mnt_root, root_mnt,2793 if (ret) {
2806 export_path, LOOKUP_FOLLOW|LOOKUP_AUTOMOUNT, &path);2794 mntput(root_mnt);
2795 return ERR_PTR(ret);
2796 }
2807 2797
2798 dentry = mount_subtree(root_mnt, export_path);
2808 nfs_referral_loop_unprotect();2799 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);
2817 2800
2818 path_put(&path);
2819 down_write(&s->s_umount);
2820 return dentry;2801 return dentry;
2821out_put_mnt_ns:
2822 put_mnt_ns(ns_private);
2823out_mntput:
2824 mntput(root_mnt);
2825out_err:
2826 return ERR_PTR(ret);
2827}2802}
2828 2803
2829static struct dentry *nfs4_try_mount(int flags, const char *dev_name,2804static 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
1886extern struct dentry *mount_nodev(struct file_system_type *fs_type,1886extern struct dentry *mount_nodev(struct file_system_type *fs_type,
1887 int flags, void *data,1887 int flags, void *data,
1888 int (*fill_super)(struct super_block *, void *, int));1888 int (*fill_super)(struct super_block *, void *, int));
1889extern struct dentry *mount_subtree(struct vfsmount *mnt, const char *path);
1889void generic_shutdown_super(struct super_block *sb);1890void generic_shutdown_super(struct super_block *sb);
1890void kill_block_super(struct super_block *sb);1891void kill_block_super(struct super_block *sb);
1891void kill_anon_super(struct super_block *sb);1892void 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