--- linux/kernel/blk_drv/scsi/sd.h	2018/04/24 18:08:13	1.1.1.1
+++ linux/kernel/blk_drv/scsi/sd.h	2018/04/24 18:13:40	1.1.1.2
@@ -8,32 +8,27 @@
 #ifndef _SD_H
 	#define _SD_H
 /*
-	$Header: /var/lib/cvsd/linux/linux/kernel/blk_drv/scsi/sd.h,v 1.1.1.1 2018/04/24 18:08:13 root Exp $
+	$Header: /var/lib/cvsd/linux/linux/kernel/blk_drv/scsi/sd.h,v 1.1.1.2 2018/04/24 18:13:40 root Exp $
 */
 
 #ifndef _SCSI_H
 #include "scsi.h"
 #endif
 
-#define MAX_SD 2
+#ifndef _GENDISK_H
+#include <linux/genhd.h>
+#endif
 
-typedef struct partition {
-	unsigned char boot_ind;		/* 0x80 - active (unused) */
-	unsigned char head;		/* ? */
-	unsigned char sector;		/* ? */
-	unsigned char cyl;		/* ? */
-	unsigned char sys_ind;		/* ? */
-	unsigned char end_head;		/* ? */
-	unsigned char end_sector;	/* ? */
-	unsigned char end_cyl;		/* ? */
-	unsigned int start_sect;	/* starting sector counting from 0 */
-	unsigned int nr_sects;		/* nr of sectors in partition */
-} Partition;
+/*
+	This is an arbitrary constant, and may be changed to whatever
+	suits your purposes.  Note that smaller will get you a few bytes
+	more in kernel space if that is your thing.
+*/
 
+#define MAX_SD 4
 extern int NR_SD;
 
-extern Partition scsi_disks[MAX_SD << 4] ;
-
+extern struct hd_struct sd[MAX_SD << 4];
 
 typedef struct {
 		unsigned capacity;		/* size in blocks */
@@ -42,9 +37,7 @@ typedef struct {
 		unsigned char sector_bit_size;	/* sector_size = 2 to the  bit size power */
 		unsigned char sector_bit_shift;	/* power of 2 sectors per FS block */
 		unsigned ten:1;			/* support ten byte read / write */
-		unsigned remap:1;		/* support remapping */
-		unsigned use:1;			/* after the initial inquiry, is 
-						   the device still supported ? */
+		unsigned remap:1;		/* support remapping  */
 		} Scsi_Disk;
 	
 extern Scsi_Disk rscsi_disks[MAX_SD];