[PATCH] more udev-016/extras/multipath

[elogind.git] / extras / multipath / main.h

diff --git a/extras/multipath/main.h b/extras/multipath/main.h
index 3941c32e7c0f884d00146b3168c7da6e964dd4bb..731c55e41f800c8a0fe79ed45b61ed53a009b7fd 100644 (file)
--- 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;
 };