diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-24 04:12:23 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-24 04:12:23 +0200 |
| commit | 84ffa747520edd4556b136bdfc9df9eb1673ce12 (patch) | |
| tree | 1cfe20bd31fce1b5b3024384fcb324c3338d1d32 /fs/jfs/symlink.c | |
| parent | [ACPI] fix ia64 build issues resulting from Lindent and merge (diff) | |
| parent | [PATCH] zd1201 kmalloc size fix (diff) | |
| download | linux-84ffa747520edd4556b136bdfc9df9eb1673ce12.tar.xz linux-84ffa747520edd4556b136bdfc9df9eb1673ce12.zip | |
Merge from-linus to-akpm
Diffstat (limited to 'fs/jfs/symlink.c')
| -rw-r--r-- | fs/jfs/symlink.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/jfs/symlink.c b/fs/jfs/symlink.c index 287d8d6c3cfd..16477b3835e1 100644 --- a/fs/jfs/symlink.c +++ b/fs/jfs/symlink.c @@ -22,11 +22,11 @@ #include "jfs_inode.h" #include "jfs_xattr.h" -static int jfs_follow_link(struct dentry *dentry, struct nameidata *nd) +static void *jfs_follow_link(struct dentry *dentry, struct nameidata *nd) { char *s = JFS_IP(dentry->d_inode)->i_inline; nd_set_link(nd, s); - return 0; + return NULL; } struct inode_operations jfs_symlink_inode_operations = { |