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/devfs | |
| parent | 4eaefb39528b3a78fb6a784162200b198d3e16ee (diff) | |
| parent | f6fdd7d9c273bb2a20ab467cb57067494f932fa3 (diff) | |
Auto-update from upstream
Diffstat (limited to 'fs/devfs')
| -rw-r--r-- | fs/devfs/base.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/devfs/base.c b/fs/devfs/base.c index 1ecfe1f184d4..8b679b67e5e0 100644 --- a/fs/devfs/base.c +++ b/fs/devfs/base.c | |||
| @@ -2491,11 +2491,11 @@ static int devfs_mknod(struct inode *dir, struct dentry *dentry, int mode, | |||
| 2491 | return 0; | 2491 | return 0; |
| 2492 | } /* End Function devfs_mknod */ | 2492 | } /* End Function devfs_mknod */ |
| 2493 | 2493 | ||
| 2494 | static int devfs_follow_link(struct dentry *dentry, struct nameidata *nd) | 2494 | static void *devfs_follow_link(struct dentry *dentry, struct nameidata *nd) |
| 2495 | { | 2495 | { |
| 2496 | struct devfs_entry *p = get_devfs_entry_from_vfs_inode(dentry->d_inode); | 2496 | struct devfs_entry *p = get_devfs_entry_from_vfs_inode(dentry->d_inode); |
| 2497 | nd_set_link(nd, p ? p->u.symlink.linkname : ERR_PTR(-ENODEV)); | 2497 | nd_set_link(nd, p ? p->u.symlink.linkname : ERR_PTR(-ENODEV)); |
| 2498 | return 0; | 2498 | return NULL; |
| 2499 | } /* End Function devfs_follow_link */ | 2499 | } /* End Function devfs_follow_link */ |
| 2500 | 2500 | ||
| 2501 | static struct inode_operations devfs_iops = { | 2501 | static struct inode_operations devfs_iops = { |