patch-2.3.1 linux/fs/isofs/inode.c

• Lines: 24
• Date: Tue May 11 23:01:41 1999
• Orig file: v2.3.0/linux/fs/isofs/inode.c
• Orig date: Tue Dec 29 11:40:35 1998

diff -u --recursive --new-file v2.3.0/linux/fs/isofs/inode.c linux/fs/isofs/inode.c
@@ -423,6 +423,7 @@
        */
       mm_segment_t old_fs=get_fs();
       inode_fake.i_rdev=dev;
+      init_waitqueue_head(&inode_fake.i_wait);
       ms_info.addr_format=CDROM_LBA;
       set_fs(KERNEL_DS);
       i=get_blkfops(MAJOR(dev))->ioctl(&inode_fake,
@@ -1210,12 +1211,9 @@
 	    inode->i_op = &isofs_dir_inode_operations;
 	  else if (S_ISLNK(inode->i_mode))
 	    inode->i_op = &isofs_symlink_inode_operations;
-	  else if (S_ISCHR(inode->i_mode))
-	    inode->i_op = &chrdev_inode_operations;
-	  else if (S_ISBLK(inode->i_mode))
-	    inode->i_op = &blkdev_inode_operations;
-	  else if (S_ISFIFO(inode->i_mode))
-	    init_fifo(inode);
+	  else
+	    /* XXX - parse_rock_ridge_inode() had already set i_rdev. */
+	    init_special_inode(inode, inode->i_mode, kdev_t_to_nr(inode->i_rdev));
 	}
 	return;