git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[pandora-kernel.git]
/
fs
/
ncpfs
/
symlink.c
diff --git
a/fs/ncpfs/symlink.c
b/fs/ncpfs/symlink.c
index
f76b139
..
e3d26c1
100644
(file)
--- a/
fs/ncpfs/symlink.c
+++ b/
fs/ncpfs/symlink.c
@@
-20,7
+20,6
@@
*
*/
*
*/
-#include <linux/config.h>
#include <asm/uaccess.h>
#include <asm/uaccess.h>
@@
-49,7
+48,7
@@
static int ncp_symlink_readpage(struct file *file, struct page *page)
char *buf = kmap(page);
error = -ENOMEM;
char *buf = kmap(page);
error = -ENOMEM;
- rawlink
=(char *)
kmalloc(NCP_MAX_SYMLINK_SIZE, GFP_KERNEL);
+ rawlink
=
kmalloc(NCP_MAX_SYMLINK_SIZE, GFP_KERNEL);
if (!rawlink)
goto fail;
if (!rawlink)
goto fail;
@@
-127,7
+126,7
@@
int ncp_symlink(struct inode *dir, struct dentry *dentry, const char *symname) {
/* EPERM is returned by VFS if symlink procedure does not exist */
return -EPERM;
/* EPERM is returned by VFS if symlink procedure does not exist */
return -EPERM;
- rawlink
=(char *)
kmalloc(NCP_MAX_SYMLINK_SIZE, GFP_KERNEL);
+ rawlink
=
kmalloc(NCP_MAX_SYMLINK_SIZE, GFP_KERNEL);
if (!rawlink)
return -ENOMEM;
if (!rawlink)
return -ENOMEM;