diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-08-22 17:31:36 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-08-22 17:31:36 -0400 |
| commit | 729c80c6ffd7633210a09d4b55fdfab3c8d1866b (patch) | |
| tree | a8fe47dfa3da91b9902e61c55a811d3a66614fc8 /fs/proc/generic.c | |
| parent | 4eaefb39528b3a78fb6a784162200b198d3e16ee (diff) | |
| parent | f6fdd7d9c273bb2a20ab467cb57067494f932fa3 (diff) | |
Auto-update from upstream
Diffstat (limited to 'fs/proc/generic.c')
| -rw-r--r-- | fs/proc/generic.c | 4 |
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) | |||
| 329 | spin_unlock(&proc_inum_lock); | 329 | spin_unlock(&proc_inum_lock); |
| 330 | } | 330 | } |
| 331 | 331 | ||
| 332 | static int proc_follow_link(struct dentry *dentry, struct nameidata *nd) | 332 | static void *proc_follow_link(struct dentry *dentry, struct nameidata *nd) |
| 333 | { | 333 | { |
| 334 | nd_set_link(nd, PDE(dentry->d_inode)->data); | 334 | nd_set_link(nd, PDE(dentry->d_inode)->data); |
| 335 | return 0; | 335 | return NULL; |
| 336 | } | 336 | } |
| 337 | 337 | ||
| 338 | static struct inode_operations proc_link_inode_operations = { | 338 | static struct inode_operations proc_link_inode_operations = { |