Life is much saner if create_mnt_ns(mnt) drops mnt in case of error...
Switch it to such calling conventions, switch callers, fix double mntput() in
fs/nfs/super.c one.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
return ERR_CAST(mnt);
ns_private = create_mnt_ns(mnt);
return ERR_CAST(mnt);
ns_private = create_mnt_ns(mnt);
- if (IS_ERR(ns_private)) {
- mntput(mnt);
+ if (IS_ERR(ns_private))
return ERR_CAST(ns_private);
return ERR_CAST(ns_private);
/*
* This will trigger the automount of the subvol so we can just
/*
* This will trigger the automount of the subvol so we can just
__mnt_make_longterm(mnt);
new_ns->root = mnt;
list_add(&new_ns->list, &new_ns->root->mnt_list);
__mnt_make_longterm(mnt);
new_ns->root = mnt;
list_add(&new_ns->list, &new_ns->root->mnt_list);
+ } else {
+ mntput(mnt);
int ret;
ns_private = create_mnt_ns(root_mnt);
int ret;
ns_private = create_mnt_ns(root_mnt);
- ret = PTR_ERR(ns_private);
+ return ERR_CAST(ns_private);
ret = nfs_referral_loop_protect();
ret = nfs_referral_loop_protect();
- if (ret != 0)
- goto out_put_mnt_ns;
-
- ret = vfs_path_lookup(root_mnt->mnt_root, root_mnt,
- export_path, LOOKUP_FOLLOW|LOOKUP_AUTOMOUNT, &path);
+ if (ret == 0) {
+ ret = vfs_path_lookup(root_mnt->mnt_root, root_mnt,
+ export_path, LOOKUP_FOLLOW|LOOKUP_AUTOMOUNT,
+ &path);
+ nfs_referral_loop_unprotect();
+ }
- nfs_referral_loop_unprotect();
put_mnt_ns(ns_private);
if (ret != 0)
put_mnt_ns(ns_private);
if (ret != 0)
s = path.mnt->mnt_sb;
atomic_inc(&s->s_active);
s = path.mnt->mnt_sb;
atomic_inc(&s->s_active);
path_put(&path);
down_write(&s->s_umount);
return dentry;
path_put(&path);
down_write(&s->s_umount);
return dentry;
-out_put_mnt_ns:
- put_mnt_ns(ns_private);
-out_mntput:
- mntput(root_mnt);
-out_err:
- return ERR_PTR(ret);
}
static struct dentry *nfs4_try_mount(int flags, const char *dev_name,
}
static struct dentry *nfs4_try_mount(int flags, const char *dev_name,