[PATCH] more udev-016/extras/multipath

incremental to udev-016/extras/multipath-0.0.16.3,

        * add a GROUP_BY_SERIAL flag. This should be useful for
          controlers that activate their spare paths on simple IO
          submition with a penalty. The StorageWorks HW defaults to
          this mode, even if the MULTIBUS mode is OK.
        * remove unused sg_err.c
        * big restructuring : split devinfo.c from main.c. Export :
                * void basename (char *, char *);
                * int get_serial (int, char *);
                * int get_lun_strings (char *, char *, char *, char *);
                * int get_evpd_wwid(char *, char *);
                * long get_disk_size (char *);
          Now we see clearly what is expected from an external package
          like scsi_id.
        * stop passing struct env as param

1 files changed, 3 insertions, 6 deletions

diff --git a/extras/multipath/main.h b/extras/multipath/main.h
index 3941c32e7c..731c55e41f 100644
--- a/extras/multipath/main.h
+++ b/extras/multipath/main.h
@@ -28,29 +28,25 @@
 #define SG_ERR_DRIVER_SENSE     0x08
 
 /* exerpt from "scsi.h" */
-#define RECOVERED_ERROR     0x01
 #define SCSI_IOCTL_GET_IDLUN            0x5382
 #define SCSI_IOCTL_GET_BUS_NUMBER       0x5386
 
 /* global defs */
 #define WWID_SIZE	33
+#define SERIAL_SIZE	14
 #define MAX_DEVS	128
 #define MAX_MP		MAX_DEVS / 2
 #define MAX_MP_PATHS	MAX_DEVS / 4
 #define FILE_NAME_SIZE	256
-#define INQUIRY_CMDLEN	6
-#define INQUIRY_CMD	0x12
-#define SENSE_BUFF_LEN	32
 #define DEF_TIMEOUT	60000
 #define EBUFF_SZ	256
 #define TUR_CMD_LEN	6
-#define MX_ALLOC_LEN	255
-#define BLKGETSIZE      _IO(0x12,96)
 #define DM_TARGET	"multipath"
 
 /* Storage controlers cpabilities */
 #define FAILOVER	0
 #define MULTIBUS	1
+#define GROUP_BY_SERIAL	2
 
 #define PINDEX(x,y)	mp[(x)].pindex[(y)]
 
@@ -88,6 +84,7 @@ struct path {
 	char vendor_id[8];
 	char product_id[16];
 	char rev[4];
+	char serial[SERIAL_SIZE];
 	int iopolicy;
 };