summaryrefslogtreecommitdiff
path: root/fs/proc/generic.c
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2005-08-22 14:31:36 -0700
committerTony Luck <tony.luck@intel.com>2005-08-22 14:31:36 -0700
commit729c80c6ffd7633210a09d4b55fdfab3c8d1866b (patch)
treea8fe47dfa3da91b9902e61c55a811d3a66614fc8 /fs/proc/generic.c
parent4eaefb39528b3a78fb6a784162200b198d3e16ee (diff)
parentf6fdd7d9c273bb2a20ab467cb57067494f932fa3 (diff)
Auto-update from upstream
Diffstat (limited to 'fs/proc/generic.c')
-rw-r--r--fs/proc/generic.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/proc/generic.c b/fs/proc/generic.c
index 6c6315d04028..abe8920313fb 100644
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -329,10 +329,10 @@ static void release_inode_number(unsigned int inum)
spin_unlock(&proc_inum_lock);
}
-static int proc_follow_link(struct dentry *dentry, struct nameidata *nd)
+static void *proc_follow_link(struct dentry *dentry, struct nameidata *nd)
{
nd_set_link(nd, PDE(dentry->d_inode)->data);
- return 0;
+ return NULL;
}
static struct inode_operations proc_link_inode_operations = {