[PATCH] update udev scsi_id to scsi_id 0.5

[elogind.git] / extras / scsi_id / scsi_serial.c

diff --git a/extras/scsi_id/scsi_serial.c b/extras/scsi_id/scsi_serial.c
index ae83330c304466d7b293e52760540015dcb68b03..e0074b662d3a9692b1c17f253c753eebfbc825b8 100644 (file)
--- a/extras/scsi_id/scsi_serial.c
+++ b/extras/scsi_id/scsi_serial.c
@@ -30,6 +30,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <syslog.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <syslog.h>

+#include <linux/compiler.h> /* need __user when built via klibc */

 #include <scsi/sg.h>
 #include <sysfs/libsysfs.h>
 #include "scsi_id.h"
 #include <scsi/sg.h>
 #include <sysfs/libsysfs.h>
 #include "scsi_id.h"


@@ -312,6 +313,8 @@ static int scsi_inquiry(struct sysfs_device *scsi_dev, int fd, unsigned
        buffer = inq + OFFSET;
 
 resend:
        buffer = inq + OFFSET;
 
 resend:

+       dprintf("%s evpd %d, page 0x%x\n", scsi_dev->name, evpd, page);
+

        memset(&io_hdr, 0, sizeof(struct sg_io_hdr));
        io_hdr.interface_id = 'S';
        io_hdr.cmd_len = sizeof(inq_cmd);
        memset(&io_hdr, 0, sizeof(struct sg_io_hdr));
        io_hdr.interface_id = 'S';
        io_hdr.cmd_len = sizeof(inq_cmd);


@@ -352,6 +355,11 @@ resend:
                retval = -1;
        }
 
                retval = -1;
        }
 

+       if (retval < 0)
+               log_message(LOG_WARNING,
+                           "%s: Unable to get INQUIRY vpd %d page 0x%x.\n",
+                           scsi_dev->name, evpd, page);
+

        free(inq);
        return retval;
 }
        free(inq);
        return retval;
 }