diff options
author | Steve French <sfrench@us.ibm.com> | 2005-08-20 21:40:00 -0700 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2005-08-20 21:40:00 -0700 |
commit | 646352319b6cd369750a706706810d87f6b6efa7 (patch) | |
tree | e7830e1276cbad7d29bf9471def4b8940592c3b7 /fs/freevxfs/vxfs_immed.c | |
parent | d3485d37c0b3292aec0618b6663c57542df5da99 (diff) | |
parent | f6fdd7d9c273bb2a20ab467cb57067494f932fa3 (diff) |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'fs/freevxfs/vxfs_immed.c')
-rw-r--r-- | fs/freevxfs/vxfs_immed.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/freevxfs/vxfs_immed.c b/fs/freevxfs/vxfs_immed.c index ac677ab262b..d0401dc68d4 100644 --- a/fs/freevxfs/vxfs_immed.c +++ b/fs/freevxfs/vxfs_immed.c @@ -38,7 +38,7 @@ #include "vxfs_inode.h" -static int vxfs_immed_follow_link(struct dentry *, struct nameidata *); +static void * vxfs_immed_follow_link(struct dentry *, struct nameidata *); static int vxfs_immed_readpage(struct file *, struct page *); @@ -72,12 +72,12 @@ struct address_space_operations vxfs_immed_aops = { * Returns: * Zero on success, else a negative error code. */ -static int +static void * vxfs_immed_follow_link(struct dentry *dp, struct nameidata *np) { struct vxfs_inode_info *vip = VXFS_INO(dp->d_inode); nd_set_link(np, vip->vii_immed.vi_immed); - return 0; + return NULL; } /** |