Skip to content

Commit

Permalink
NFS: Pass mntfh as part of the nfs_mount_info structure
Browse files Browse the repository at this point in the history 
This allows me to use the filehandle allocated in nfs_fs_mount() for nfs
v4 mounts instead of allocating a new one.  Rather than change
nfs4_mount() to look almost exactly like nfs_fs_mount(), I instead
remove the function.

Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  • Loading branch information
Bryan Schumaker authored and Trond Myklebust committed May 15, 2012
1 parent 46058d4 commit 87c7083
Showing 1 changed file with 31 additions and 76 deletions.
107 changes: 31 additions & 76 deletions fs/nfs/super.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,7 @@ struct nfs_mount_info {
int (*set_security)(struct super_block *, struct dentry *, struct nfs_mount_info *);
struct nfs_parsed_mount_data *parsed;
struct nfs_clone_mount *cloned;
struct nfs_fh *mntfh;
};

static void nfs_umount_begin(struct super_block *);
Expand All @@ -292,8 +293,7 @@ static int nfs_show_devname(struct seq_file *, struct dentry *);
static int nfs_show_path(struct seq_file *, struct dentry *);
static int nfs_show_stats(struct seq_file *, struct dentry *);
static struct dentry *nfs_fs_mount_common(struct file_system_type *,
struct nfs_server *, int, const char *, struct nfs_fh *,
struct nfs_mount_info *);
struct nfs_server *, int, const char *, struct nfs_mount_info *);
static struct dentry *nfs_fs_mount(struct file_system_type *,
int, const char *, void *);
static struct dentry *nfs_xdev_mount(struct file_system_type *fs_type,
Expand Down Expand Up @@ -338,9 +338,7 @@ static void nfs4_validate_mount_flags(struct nfs_parsed_mount_data *);
static int nfs4_validate_mount_data(void *options,
struct nfs_parsed_mount_data *args, const char *dev_name);
static struct dentry *nfs4_try_mount(int flags, const char *dev_name,
struct nfs_parsed_mount_data *data);
static struct dentry *nfs4_mount(struct file_system_type *fs_type,
int flags, const char *dev_name, void *raw_data);
struct nfs_mount_info *mount_info);
static struct dentry *nfs4_remote_mount(struct file_system_type *fs_type,
int flags, const char *dev_name, void *raw_data);
static struct dentry *nfs4_xdev_mount(struct file_system_type *fs_type,
Expand All @@ -354,7 +352,7 @@ static void nfs4_kill_super(struct super_block *sb);
static struct file_system_type nfs4_fs_type = {
.owner = THIS_MODULE,
.name = "nfs4",
.mount = nfs4_mount,
.mount = nfs_fs_mount,
.kill_sb = nfs4_kill_super,
.fs_flags = FS_RENAME_DOES_D_MOVE|FS_REVAL_DOT|FS_BINARY_MOUNTDATA,
};
Expand Down Expand Up @@ -1751,24 +1749,23 @@ static int nfs_request_mount(struct nfs_parsed_mount_data *args,
}

static struct dentry *nfs_try_mount(int flags, const char *dev_name,
struct nfs_fh *mntfh,
struct nfs_mount_info *mount_info)
{
int status;
struct nfs_server *server;

if (mount_info->parsed->need_mount) {
status = nfs_request_mount(mount_info->parsed, mntfh);
status = nfs_request_mount(mount_info->parsed, mount_info->mntfh);
if (status)
return ERR_PTR(status);
}

/* Get a volume representation */
server = nfs_create_server(mount_info->parsed, mntfh);
server = nfs_create_server(mount_info->parsed, mount_info->mntfh);
if (IS_ERR(server))
return ERR_CAST(server);

return nfs_fs_mount_common(&nfs_fs_type, server, flags, dev_name, mntfh, mount_info);
return nfs_fs_mount_common(&nfs_fs_type, server, flags, dev_name, mount_info);
}

/*
Expand Down Expand Up @@ -2394,7 +2391,6 @@ static int nfs_clone_sb_security(struct super_block *s, struct dentry *mntroot,
static struct dentry *nfs_fs_mount_common(struct file_system_type *fs_type,
struct nfs_server *server,
int flags, const char *dev_name,
struct nfs_fh *mntfh,
struct nfs_mount_info *mount_info)
{
struct super_block *s;
Expand Down Expand Up @@ -2437,7 +2433,7 @@ static struct dentry *nfs_fs_mount_common(struct file_system_type *fs_type,
nfs_get_cache_cookie(s, mount_info->parsed, mount_info->cloned);
}

mntroot = nfs_get_root(s, mntfh, dev_name);
mntroot = nfs_get_root(s, mount_info->mntfh, dev_name);
if (IS_ERR(mntroot))
goto error_splat_super;

Expand Down Expand Up @@ -2472,17 +2468,16 @@ static struct dentry *nfs_fs_mount(struct file_system_type *fs_type,
.fill_super = nfs_fill_super,
.set_security = nfs_set_sb_security,
};
struct nfs_fh *mntfh;
struct dentry *mntroot = ERR_PTR(-ENOMEM);
int error;

mount_info.parsed = nfs_alloc_parsed_mount_data();
mntfh = nfs_alloc_fhandle();
if (mount_info.parsed == NULL || mntfh == NULL)
mount_info.mntfh = nfs_alloc_fhandle();
if (mount_info.parsed == NULL || mount_info.mntfh == NULL)
goto out;

/* Validate the mount data */
error = nfs_validate_mount_data(fs_type, raw_data, mount_info.parsed, mntfh, dev_name);
error = nfs_validate_mount_data(fs_type, raw_data, mount_info.parsed, mount_info.mntfh, dev_name);
if (error == NFS_TEXT_DATA)
error = nfs_validate_text_mount_data(raw_data, mount_info.parsed, dev_name);
if (error < 0) {
Expand All @@ -2492,14 +2487,14 @@ static struct dentry *nfs_fs_mount(struct file_system_type *fs_type,

#ifdef CONFIG_NFS_V4
if (mount_info.parsed->version == 4)
mntroot = nfs4_try_mount(flags, dev_name, mount_info.parsed);
mntroot = nfs4_try_mount(flags, dev_name, &mount_info);
else
#endif /* CONFIG_NFS_V4 */
mntroot = nfs_try_mount(flags, dev_name, mntfh, &mount_info);
mntroot = nfs_try_mount(flags, dev_name, &mount_info);

out:
nfs_free_parsed_mount_data(mount_info.parsed);
nfs_free_fhandle(mntfh);
nfs_free_fhandle(mount_info.mntfh);
return mntroot;
}

Expand Down Expand Up @@ -2540,14 +2535,16 @@ nfs_xdev_mount_common(struct file_system_type *fs_type, int flags,

dprintk("--> nfs_xdev_mount_common()\n");

mount_info->mntfh = data->fh;

/* create a new volume representation */
server = nfs_clone_server(NFS_SB(data->sb), data->fh, data->fattr, data->authflavor);
if (IS_ERR(server)) {
error = PTR_ERR(server);
goto out_err;
}

mntroot = nfs_fs_mount_common(fs_type, server, flags, dev_name, data->fh, mount_info);
mntroot = nfs_fs_mount_common(fs_type, server, flags, dev_name, mount_info);
dprintk("<-- nfs_xdev_mount_common() = 0\n");
out:
return mntroot;
Expand Down Expand Up @@ -2712,33 +2709,25 @@ static int nfs4_validate_mount_data(void *options,
*/
static struct dentry *
nfs4_remote_mount(struct file_system_type *fs_type, int flags,
const char *dev_name, void *raw_data)
const char *dev_name, void *info)
{
struct nfs_mount_info mount_info = {
.fill_super = nfs4_fill_super,
.set_security = nfs_set_sb_security,
.parsed = raw_data,
};
struct nfs_mount_info *mount_info = info;
struct nfs_server *server;
struct nfs_fh *mntfh;
struct dentry *mntroot = ERR_PTR(-ENOMEM);

mntfh = nfs_alloc_fhandle();
if (mount_info.parsed == NULL || mntfh == NULL)
goto out;
mount_info->fill_super = nfs4_fill_super;
mount_info->set_security = nfs_set_sb_security;

/* Get a volume representation */
server = nfs4_create_server(mount_info.parsed, mntfh);
server = nfs4_create_server(mount_info->parsed, mount_info->mntfh);
if (IS_ERR(server)) {
mntroot = ERR_CAST(server);
goto out;
}

mntroot = nfs_fs_mount_common(fs_type, server, flags,
dev_name, mntfh, &mount_info);
mntroot = nfs_fs_mount_common(fs_type, server, flags, dev_name, mount_info);

out:
nfs_free_fhandle(mntfh);
return mntroot;
}

Expand Down Expand Up @@ -2851,17 +2840,18 @@ static struct dentry *nfs_follow_remote_path(struct vfsmount *root_mnt,
}

static struct dentry *nfs4_try_mount(int flags, const char *dev_name,
struct nfs_parsed_mount_data *data)
struct nfs_mount_info *mount_info)
{
char *export_path;
struct vfsmount *root_mnt;
struct dentry *res;
struct nfs_parsed_mount_data *data = mount_info->parsed;

dfprintk(MOUNT, "--> nfs4_try_mount()\n");

export_path = data->nfs_server.export_path;
data->nfs_server.export_path = "/";
root_mnt = nfs_do_root_mount(&nfs4_remote_fs_type, flags, data,
root_mnt = nfs_do_root_mount(&nfs4_remote_fs_type, flags, mount_info,
data->nfs_server.hostname);
data->nfs_server.export_path = export_path;

Expand All @@ -2873,40 +2863,6 @@ static struct dentry *nfs4_try_mount(int flags, const char *dev_name,
return res;
}

/*
* Get the superblock for an NFS4 mountpoint
*/
static struct dentry *nfs4_mount(struct file_system_type *fs_type,
int flags, const char *dev_name, void *raw_data)
{
struct nfs_parsed_mount_data *data;
int error = -ENOMEM;
struct dentry *res = ERR_PTR(-ENOMEM);

data = nfs_alloc_parsed_mount_data();
if (data == NULL)
goto out;

/* Validate the mount data */
error = nfs_validate_mount_data(fs_type, raw_data, data, NULL, dev_name);
if (error == NFS_TEXT_DATA)
error = nfs_validate_text_mount_data(raw_data, data, dev_name);
if (error < 0) {
res = ERR_PTR(error);
goto out;
}

res = nfs4_try_mount(flags, dev_name, data);
if (IS_ERR(res))
error = PTR_ERR(res);

out:
nfs_free_parsed_mount_data(data);
dprintk("<-- nfs4_mount() = %d%s\n", error,
error != 0 ? " [error]" : "");
return res;
}

static void nfs4_kill_super(struct super_block *sb)
{
struct nfs_server *server = NFS_SB(sb);
Expand Down Expand Up @@ -2945,24 +2901,23 @@ nfs4_remote_referral_mount(struct file_system_type *fs_type, int flags,
};
struct nfs_server *server;
struct dentry *mntroot = ERR_PTR(-ENOMEM);
struct nfs_fh *mntfh;

dprintk("--> nfs4_referral_get_sb()\n");

mntfh = nfs_alloc_fhandle();
if (mount_info.cloned == NULL || mntfh == NULL)
mount_info.mntfh = nfs_alloc_fhandle();
if (mount_info.cloned == NULL || mount_info.mntfh == NULL)
goto out;

/* create a new volume representation */
server = nfs4_create_referral_server(mount_info.cloned, mntfh);
server = nfs4_create_referral_server(mount_info.cloned, mount_info.mntfh);
if (IS_ERR(server)) {
mntroot = ERR_CAST(server);
goto out;
}

mntroot = nfs_fs_mount_common(&nfs4_fs_type, server, flags, dev_name, mntfh, &mount_info);
mntroot = nfs_fs_mount_common(&nfs4_fs_type, server, flags, dev_name, &mount_info);
out:
nfs_free_fhandle(mntfh);
nfs_free_fhandle(mount_info.mntfh);
return mntroot;
}

Expand Down

0 comments on commit 87c7083

Please sign in to comment.