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/ext3 | |
| parent | d3485d37c0b3292aec0618b6663c57542df5da99 (diff) | |
| parent | f6fdd7d9c273bb2a20ab467cb57067494f932fa3 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'fs/ext3')
| -rw-r--r-- | fs/ext3/symlink.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext3/symlink.c b/fs/ext3/symlink.c index 8c3e72818fb0..4f79122cde67 100644 --- a/fs/ext3/symlink.c +++ b/fs/ext3/symlink.c | |||
| @@ -23,11 +23,11 @@ | |||
| 23 | #include <linux/namei.h> | 23 | #include <linux/namei.h> |
| 24 | #include "xattr.h" | 24 | #include "xattr.h" |
| 25 | 25 | ||
| 26 | static int ext3_follow_link(struct dentry *dentry, struct nameidata *nd) | 26 | static void * ext3_follow_link(struct dentry *dentry, struct nameidata *nd) |
| 27 | { | 27 | { |
| 28 | struct ext3_inode_info *ei = EXT3_I(dentry->d_inode); | 28 | struct ext3_inode_info *ei = EXT3_I(dentry->d_inode); |
| 29 | nd_set_link(nd, (char*)ei->i_data); | 29 | nd_set_link(nd, (char*)ei->i_data); |
| 30 | return 0; | 30 | return NULL; |
| 31 | } | 31 | } |
| 32 | 32 | ||
| 33 | struct inode_operations ext3_symlink_inode_operations = { | 33 | struct inode_operations ext3_symlink_inode_operations = { |