diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
| commit | aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b (patch) | |
| tree | 57425aa83c8bed5b41af7e3408024fe1f2fdded9 /fs/ncpfs/symlink.c | |
| parent | 022e7a12b6aa11a11de4d708fe8606c9a6734b37 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
| download | kernel-crypto-aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b.tar.gz kernel-crypto-aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b.tar.xz kernel-crypto-aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'fs/ncpfs/symlink.c')
| -rw-r--r-- | fs/ncpfs/symlink.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ncpfs/symlink.c b/fs/ncpfs/symlink.c index ca92c240663..e3d26c1bd10 100644 --- a/fs/ncpfs/symlink.c +++ b/fs/ncpfs/symlink.c @@ -48,7 +48,7 @@ static int ncp_symlink_readpage(struct file *file, struct page *page) 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; @@ -126,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; - rawlink=(char *)kmalloc(NCP_MAX_SYMLINK_SIZE, GFP_KERNEL); + rawlink = kmalloc(NCP_MAX_SYMLINK_SIZE, GFP_KERNEL); if (!rawlink) return -ENOMEM; |