diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
| commit | 185a257f2f73bcd89050ad02da5bedbc28fc43fa (patch) | |
| tree | 5e32586114534ed3f2165614cba3d578f5d87307 /fs/ncpfs/symlink.c | |
| parent | 3f1a9aaeffd8d1cbc5ab9776c45cbd66af1c9699 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into gfs2
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 ca92c2406635..e3d26c1bd105 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) | |||
| 48 | char *buf = kmap(page); | 48 | char *buf = kmap(page); |
| 49 | 49 | ||
| 50 | error = -ENOMEM; | 50 | error = -ENOMEM; |
| 51 | rawlink=(char *)kmalloc(NCP_MAX_SYMLINK_SIZE, GFP_KERNEL); | 51 | rawlink = kmalloc(NCP_MAX_SYMLINK_SIZE, GFP_KERNEL); |
| 52 | if (!rawlink) | 52 | if (!rawlink) |
| 53 | goto fail; | 53 | goto fail; |
| 54 | 54 | ||
| @@ -126,7 +126,7 @@ int ncp_symlink(struct inode *dir, struct dentry *dentry, const char *symname) { | |||
| 126 | /* EPERM is returned by VFS if symlink procedure does not exist */ | 126 | /* EPERM is returned by VFS if symlink procedure does not exist */ |
| 127 | return -EPERM; | 127 | return -EPERM; |
| 128 | 128 | ||
| 129 | rawlink=(char *)kmalloc(NCP_MAX_SYMLINK_SIZE, GFP_KERNEL); | 129 | rawlink = kmalloc(NCP_MAX_SYMLINK_SIZE, GFP_KERNEL); |
| 130 | if (!rawlink) | 130 | if (!rawlink) |
| 131 | return -ENOMEM; | 131 | return -ENOMEM; |
| 132 | 132 | ||