leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NFS: Allocate parsed mount data directly to the nfs_mount_info structure

Browse Source 
Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Bryan Schumaker 2012-05-10 15:07:42 -04:00 committed by Trond Myklebust
parent d72c727cd9
commit 46058d46d3
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fs/nfs/super.c
View File

@ -2468,7 +2468,6 @@ error_splat_bdi:
static struct dentry *nfs_fs_mount(struct file_system_type *fs_type, static struct dentry *nfs_fs_mount(struct file_system_type *fs_type,
int flags, const char *dev_name, void *raw_data) int flags, const char *dev_name, void *raw_data)
{ {
struct nfs_parsed_mount_data *data = NULL;
struct nfs_mount_info mount_info = { struct nfs_mount_info mount_info = {
.fill_super = nfs_fill_super, .fill_super = nfs_fill_super,
.set_security = nfs_set_sb_security, .set_security = nfs_set_sb_security,
@ -2477,30 +2476,29 @@ static struct dentry *nfs_fs_mount(struct file_system_type *fs_type,
struct dentry *mntroot = ERR_PTR(-ENOMEM); struct dentry *mntroot = ERR_PTR(-ENOMEM);
int error; int error;
data = nfs_alloc_parsed_mount_data(); mount_info.parsed = nfs_alloc_parsed_mount_data();
mntfh = nfs_alloc_fhandle(); mntfh = nfs_alloc_fhandle();
if (data == NULL || mntfh == NULL) if (mount_info.parsed == NULL || mntfh == NULL)
goto out; goto out;
/* Validate the mount data */ /* Validate the mount data */
error = nfs_validate_mount_data(fs_type, raw_data, data, mntfh, dev_name); error = nfs_validate_mount_data(fs_type, raw_data, mount_info.parsed, mntfh, dev_name);
if (error == NFS_TEXT_DATA) if (error == NFS_TEXT_DATA)
error = nfs_validate_text_mount_data(raw_data, data, dev_name); error = nfs_validate_text_mount_data(raw_data, mount_info.parsed, dev_name);
if (error < 0) { if (error < 0) {
mntroot = ERR_PTR(error); mntroot = ERR_PTR(error);
goto out; goto out;
} }
mount_info.parsed = data;
#ifdef CONFIG_NFS_V4 #ifdef CONFIG_NFS_V4
if (data->version == 4) if (mount_info.parsed->version == 4)
mntroot = nfs4_try_mount(flags, dev_name, data); mntroot = nfs4_try_mount(flags, dev_name, mount_info.parsed);
else else
#endif /* CONFIG_NFS_V4 */ #endif /* CONFIG_NFS_V4 */
mntroot = nfs_try_mount(flags, dev_name, mntfh, &mount_info); mntroot = nfs_try_mount(flags, dev_name, mntfh, &mount_info);
out: out:
nfs_free_parsed_mount_data(data); nfs_free_parsed_mount_data(mount_info.parsed);
nfs_free_fhandle(mntfh); nfs_free_fhandle(mntfh);
return mntroot; return mntroot;
} }