UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

cifs: allocate mountdata earlier 

pull mountdata allocation up, so that it won't stand in the way when
we lift cifs_mount() to location before sget().

Acked-by: Pavel Shilovsky <piastryyy@gmail.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2011-06-17 09:17:28 -04:00
parent d687ca380f
commit 5d3bc605ca
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fs/cifs/cifsfs.c
View File

@ -687,6 +687,14 @@ cifs_do_mount(struct file_system_type *fs_type,
goto out; goto out;
} }
cifs_sb->mountdata = kstrndup(data, PAGE_SIZE, GFP_KERNEL);
if (cifs_sb->mountdata == NULL) {
root = ERR_PTR(-ENOMEM);
unload_nls(volume_info->local_nls);
kfree(cifs_sb);
goto out;
}
cifs_setup_cifs_sb(volume_info, cifs_sb); cifs_setup_cifs_sb(volume_info, cifs_sb);
mnt_data.vol = volume_info; mnt_data.vol = volume_info;
@ -701,22 +709,12 @@ cifs_do_mount(struct file_system_type *fs_type,
if (sb->s_fs_info) { if (sb->s_fs_info) {
cFYI(1, "Use existing superblock"); cFYI(1, "Use existing superblock");
kfree(cifs_sb->mountdata);
unload_nls(cifs_sb->local_nls); unload_nls(cifs_sb->local_nls);
kfree(cifs_sb); kfree(cifs_sb);
goto out_shared; goto out_shared;
} }
/*
* Copy mount params for use in submounts. Better to do
* the copy here and deal with the error before cleanup gets
* complicated post-mount.
*/
cifs_sb->mountdata = kstrndup(data, PAGE_SIZE, GFP_KERNEL);
if (cifs_sb->mountdata == NULL) {
root = ERR_PTR(-ENOMEM);
goto out_super;
}
sb->s_flags = flags; sb->s_flags = flags;
/* BB should we make this contingent on mount parm? */ /* BB should we make this contingent on mount parm? */
sb->s_flags |= MS_NODIRATIME | MS_NOATIME; sb->s_flags |= MS_NODIRATIME | MS_NOATIME;
@ -749,6 +747,7 @@ out_super:
goto out; goto out;
out_cifs_sb: out_cifs_sb:
kfree(cifs_sb->mountdata);
unload_nls(cifs_sb->local_nls); unload_nls(cifs_sb->local_nls);
kfree(cifs_sb); kfree(cifs_sb);