summaryrefslogtreecommitdiff
path: root/fs/devfs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@athlon.transmeta.com>2002-02-04 18:17:03 -0800
committerLinus Torvalds <torvalds@athlon.transmeta.com>2002-02-04 18:17:03 -0800
commit560e89962e32171585dd95af9ac9911ebc0e02ce (patch)
tree4c3bb66e7344a72dd005144891677537c9c4a607 /fs/devfs
parent923215ae27c66dc2d25cc93ce1f7d3ef821c80bc (diff)
v2.4.4.4 -> v2.4.4.5
- Al Viro: fs cleanups - David Miller: sparc semaphores - Christoph Hellwig: VxFS update - Asit Mallick: set machine check bit with set_in_cr4 - Richard Henderson: fix alpha pci_controller_num(), sg_fill, SRM poweroff. - Johannes Erdfelt: USB updates - Cort Dougan: bitkeeper Id's on the ppc side - Matt Chapman: NFS file locking SMP lock fix - Alan Cox: further merging
Diffstat (limited to 'fs/devfs')
-rw-r--r--fs/devfs/base.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/devfs/base.c b/fs/devfs/base.c
index bfdacd6abd6a..5622686366f3 100644
--- a/fs/devfs/base.c
+++ b/fs/devfs/base.c
@@ -2256,12 +2256,13 @@ static void devfs_read_inode (struct inode *inode)
{
inode->i_rdev = MKDEV (de->u.fcb.u.device.major,
de->u.fcb.u.device.minor);
+ inode->i_cdev = cdget (kdev_t_to_nr(inode->i_rdev));
}
else if ( S_ISBLK (de->inode.mode) )
{
inode->i_rdev = MKDEV (de->u.fcb.u.device.major,
de->u.fcb.u.device.minor);
- inode->i_bdev = bdget (inode->i_rdev);
+ inode->i_bdev = bdget (kdev_t_to_nr(inode->i_rdev));
if (inode->i_bdev)
{
if (!inode->i_bdev->bd_op && de->u.fcb.ops)