git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ceph: include preferred_osd in file layout virtual xattr
[safe/jmp/linux-2.6]
/
fs
/
compat.c
diff --git
a/fs/compat.c
b/fs/compat.c
index
3aa4883
..
d576b55
100644
(file)
--- a/
fs/compat.c
+++ b/
fs/compat.c
@@
-768,13
+768,13
@@
asmlinkage long compat_sys_mount(char __user * dev_name, char __user * dir_name,
char __user * type, unsigned long flags,
void __user * data)
{
char __user * type, unsigned long flags,
void __user * data)
{
-
unsigned long type_pag
e;
+
char *kernel_typ
e;
unsigned long data_page;
unsigned long data_page;
-
unsigned long dev_page
;
+
char *kernel_dev
;
char *dir_page;
int retval;
char *dir_page;
int retval;
- retval = copy_mount_
options (type, &type_pag
e);
+ retval = copy_mount_
string(type, &kernel_typ
e);
if (retval < 0)
goto out;
if (retval < 0)
goto out;
@@
-783,38
+783,38
@@
asmlinkage long compat_sys_mount(char __user * dev_name, char __user * dir_name,
if (IS_ERR(dir_page))
goto out1;
if (IS_ERR(dir_page))
goto out1;
- retval = copy_mount_
options (dev_name, &dev_page
);
+ retval = copy_mount_
string(dev_name, &kernel_dev
);
if (retval < 0)
goto out2;
if (retval < 0)
goto out2;
- retval = copy_mount_options
(data, &data_page);
+ retval = copy_mount_options(data, &data_page);
if (retval < 0)
goto out3;
retval = -EINVAL;
if (retval < 0)
goto out3;
retval = -EINVAL;
- if (
type_pag
e && data_page) {
- if (!strcmp(
(char *)type_pag
e, SMBFS_NAME)) {
+ if (
kernel_typ
e && data_page) {
+ if (!strcmp(
kernel_typ
e, SMBFS_NAME)) {
do_smb_super_data_conv((void *)data_page);
do_smb_super_data_conv((void *)data_page);
- } else if (!strcmp(
(char *)type_pag
e, NCPFS_NAME)) {
+ } else if (!strcmp(
kernel_typ
e, NCPFS_NAME)) {
do_ncp_super_data_conv((void *)data_page);
do_ncp_super_data_conv((void *)data_page);
- } else if (!strcmp(
(char *)type_pag
e, NFS4_NAME)) {
+ } else if (!strcmp(
kernel_typ
e, NFS4_NAME)) {
if (do_nfs4_super_data_conv((void *) data_page))
goto out4;
}
}
if (do_nfs4_super_data_conv((void *) data_page))
goto out4;
}
}
- retval = do_mount(
(char*)dev_page, dir_page, (char*)type_pag
e,
+ retval = do_mount(
kernel_dev, dir_page, kernel_typ
e,
flags, (void*)data_page);
out4:
free_page(data_page);
out3:
flags, (void*)data_page);
out4:
free_page(data_page);
out3:
-
free_page(dev_page
);
+
kfree(kernel_dev
);
out2:
putname(dir_page);
out1:
out2:
putname(dir_page);
out1:
-
free_page(type_pag
e);
+
kfree(kernel_typ
e);
out:
return retval;
}
out:
return retval;
}