patch-1.3.28 linux/drivers/block/gscd.c

• Lines: 39
• Date: Mon Sep 18 08:54:07 1995
• Orig file: v1.3.27/linux/drivers/block/gscd.c
• Orig date: Fri Jul 7 08:54:45 1995

diff -u --recursive --new-file v1.3.27/linux/drivers/block/gscd.c linux/drivers/block/gscd.c
@@ -95,7 +95,7 @@
 static int  gscd_ioctl            (struct inode *, struct file *, unsigned int, unsigned long);
 static int  gscd_open             (struct inode *, struct file *);
 static void gscd_release          (struct inode *, struct file *);
-static int  check_gscd_med_chg    (dev_t);
+static int  check_gscd_med_chg    (kdev_t);
 
 /*      GoldStar Funktionen    */
 
@@ -177,7 +177,7 @@
  * Checking if the media has been changed
  * (not yet implemented)
  */
-static int check_gscd_med_chg (dev_t full_dev)
+static int check_gscd_med_chg (kdev_t full_dev)
 {
    int target;
 
@@ -270,9 +270,9 @@
 unsigned int nsect;
 
 repeat:
-	if (!(CURRENT) || CURRENT->dev < 0) return;
+	if (!(CURRENT) || CURRENT->rq_status == RQ_INACTIVE) return;
 	INIT_REQUEST;
-	dev = MINOR(CURRENT->dev);
+	dev = MINOR(CURRENT->rq_dev);
 	block = CURRENT->sector;
 	nsect = CURRENT->nr_sectors;
 
@@ -286,7 +286,7 @@
 		goto repeat;
 	}
 
-	if (MINOR(CURRENT -> dev) != 0)
+	if (MINOR(CURRENT -> rq_dev) != 0)
 	{
 		printk("GSCD: this version supports only one device\n");
 		end_request(0);