patch-2.4.0-test5 linux/fs/isofs/inode.c

• Lines: 29
• Date: Tue Jul 18 21:40:47 2000
• Orig file: v2.4.0-test4/linux/fs/isofs/inode.c
• Orig date: Thu May 11 15:30:08 2000

diff -u --recursive --new-file v2.4.0-test4/linux/fs/isofs/inode.c linux/fs/isofs/inode.c
@@ -415,19 +415,10 @@
 	struct cdrom_multisession ms_info;
 	unsigned int vol_desc_start;
 	struct block_device *bdev = sb->s_bdev;
-	kdev_t dev = sb->s_dev;
 	int i;
 
 	vol_desc_start=0;
 	ms_info.addr_format=CDROM_LBA;
-	/* If a minor device was explicitly opened, set session to the
-	 * minor number. For instance, if /dev/hdc1 is mounted, session
-	 * 1 on the CD-ROM is selected. CD_PART_MAX gives access to
-	 * a max of 64 sessions on IDE. SCSI drives must still use
-	 * the session option to mount.
-	 */
-	if ((MINOR(dev) % CD_PART_MAX) && (MAJOR(dev) != SCSI_CDROM_MAJOR))
-		session = MINOR(dev) % CD_PART_MAX;
 	if(session >= 0 && session <= 99) {
 		struct cdrom_tocentry Te;
 		Te.cdte_track=session;
@@ -1420,7 +1411,7 @@
 
 void leak_check_free_s(void * obj, int size){
   check_malloc--;
-  return kfree_s(obj, size);
+  return kfree(obj);
 }
 
 struct buffer_head * leak_check_bread(int dev, int block, int size){