Commit dcf474f3 authored by David S. Miller's avatar David S. Miller

Merge davem@nuts.davemloft.net:/disk1/BK/sparc-2.6

into kernel.bkbits.net:/home/davem/sparc-2.6
parents bda1ea3d a0711ec8
......@@ -1481,14 +1481,13 @@ asmlinkage int sys32_mount(char *dev_name, char *dir_name, char *type, unsigned
if (err)
goto out;
if (!type_page) {
err = -EINVAL;
goto out;
if (type_page) {
is_smb = !strcmp((char *)type_page, SMBFS_NAME);
is_ncp = !strcmp((char *)type_page, NCPFS_NAME);
} else {
is_smb = is_ncp = 0;
}
is_smb = !strcmp((char *)type_page, SMBFS_NAME);
is_ncp = !strcmp((char *)type_page, NCPFS_NAME);
err = copy_mount_stuff_to_kernel((const void *)AA(data), &data_page);
if (err)
goto type_out;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment