diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-08-21 00:40:00 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-08-21 00:40:00 -0400 |
| commit | 646352319b6cd369750a706706810d87f6b6efa7 (patch) | |
| tree | e7830e1276cbad7d29bf9471def4b8940592c3b7 /fs/jfs/symlink.c | |
| parent | d3485d37c0b3292aec0618b6663c57542df5da99 (diff) | |
| parent | f6fdd7d9c273bb2a20ab467cb57067494f932fa3 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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 @@ | |||
| 22 | #include "jfs_inode.h" | 22 | #include "jfs_inode.h" |
| 23 | #include "jfs_xattr.h" | 23 | #include "jfs_xattr.h" |
| 24 | 24 | ||
| 25 | static int jfs_follow_link(struct dentry *dentry, struct nameidata *nd) | 25 | static void *jfs_follow_link(struct dentry *dentry, struct nameidata *nd) |
| 26 | { | 26 | { |
| 27 | char *s = JFS_IP(dentry->d_inode)->i_inline; | 27 | char *s = JFS_IP(dentry->d_inode)->i_inline; |
| 28 | nd_set_link(nd, s); | 28 | nd_set_link(nd, s); |
| 29 | return 0; | 29 | return NULL; |
| 30 | } | 30 | } |
| 31 | 31 | ||
| 32 | struct inode_operations jfs_symlink_inode_operations = { | 32 | struct inode_operations jfs_symlink_inode_operations = { |