diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-23 22:12:23 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-23 22:12:23 -0400 |
| commit | 84ffa747520edd4556b136bdfc9df9eb1673ce12 (patch) | |
| tree | 1cfe20bd31fce1b5b3024384fcb324c3338d1d32 /fs/devfs | |
| parent | 702c7e7626deeabb057b6f529167b65ec2eefbdb (diff) | |
| parent | 81065e2f415af6c028eac13f481fb9e60a0b487b (diff) | |
Merge from-linus to-akpm
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 = { |