summaryrefslogtreecommitdiffstats
path: root/fs/ext2/symlink.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2005-08-20 21:40:00 -0700
committerSteve French <sfrench@us.ibm.com>2005-08-20 21:40:00 -0700
commit646352319b6cd369750a706706810d87f6b6efa7 (patch)
treee7830e1276cbad7d29bf9471def4b8940592c3b7 /fs/ext2/symlink.c
parentd3485d37c0b3292aec0618b6663c57542df5da99 (diff)
parentf6fdd7d9c273bb2a20ab467cb57067494f932fa3 (diff)
downloadop-kernel-dev-646352319b6cd369750a706706810d87f6b6efa7.zip
op-kernel-dev-646352319b6cd369750a706706810d87f6b6efa7.tar.gz
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'fs/ext2/symlink.c')
-rw-r--r--fs/ext2/symlink.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext2/symlink.c b/fs/ext2/symlink.c
index 9f7bac0..1e67d87 100644
--- a/fs/ext2/symlink.c
+++ b/fs/ext2/symlink.c
@@ -21,11 +21,11 @@
#include "xattr.h"
#include <linux/namei.h>
-static int ext2_follow_link(struct dentry *dentry, struct nameidata *nd)
+static void *ext2_follow_link(struct dentry *dentry, struct nameidata *nd)
{
struct ext2_inode_info *ei = EXT2_I(dentry->d_inode);
nd_set_link(nd, (char *)ei->i_data);
- return 0;
+ return NULL;
}
struct inode_operations ext2_symlink_inode_operations = {
OpenPOWER on IntegriCloud