chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
release 126
[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 bea447fdacfdfbc391defe642c90a9c0b201d95f..104db3d95ff1ec95ffc10012f5b3649c3bfd6795 100644
(file)
--- a/
extras/scsi_id/scsi_serial.c
+++ b/
extras/scsi_id/scsi_serial.c
@@
-15,6
+15,7
@@
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/types.h>
#include <sys/ioctl.h>
+#include <sys/stat.h>
#include <stdio.h>
#include <errno.h>
#include <string.h>
#include <stdio.h>
#include <errno.h>
#include <string.h>
@@
-29,10
+30,9
@@
/* #include <linux/bsg.h> */
#include "bsg.h"
/* #include <linux/bsg.h> */
#include "bsg.h"
-#include "../../udev.h"
+#include "../../udev
/udev
.h"
#include "scsi.h"
#include "scsi_id.h"
#include "scsi.h"
#include "scsi_id.h"
-#include "scsi_id_version.h"
/*
* A priority based list of id, naa, and binary/ascii for the identifier
/*
* A priority based list of id, naa, and binary/ascii for the identifier
@@
-308,8
+308,6
@@
static int scsi_inquiry(struct scsi_id_device *dev_scsi, int fd,
unsigned char inq_cmd[INQUIRY_CMDLEN] =
{ INQUIRY_CMD, evpd, page, 0, buflen, 0 };
unsigned char sense[SENSE_BUFF_LEN];
unsigned char inq_cmd[INQUIRY_CMDLEN] =
{ INQUIRY_CMD, evpd, page, 0, buflen, 0 };
unsigned char sense[SENSE_BUFF_LEN];
- struct sg_io_hdr io_hdr;
- struct sg_io_v4 io_v4;
void *io_buf;
int retval;
int retry = 3; /* rather random */
void *io_buf;
int retval;
int retry = 3; /* rather random */
@@
-323,6
+321,8
@@
resend:
dbg("%s evpd %d, page 0x%x\n", dev_scsi->kernel, evpd, page);
if (dev_scsi->use_sg == 4) {
dbg("%s evpd %d, page 0x%x\n", dev_scsi->kernel, evpd, page);
if (dev_scsi->use_sg == 4) {
+ struct sg_io_v4 io_v4;
+
memset(&io_v4, 0, sizeof(struct sg_io_v4));
io_v4.guard = 'Q';
io_v4.protocol = BSG_PROTOCOL_SCSI;
memset(&io_v4, 0, sizeof(struct sg_io_v4));
io_v4.guard = 'Q';
io_v4.protocol = BSG_PROTOCOL_SCSI;
@@
-335,6
+335,8
@@
resend:
io_v4.din_xferp = (uintptr_t)buf;
io_buf = (void *)&io_v4;
} else {
io_v4.din_xferp = (uintptr_t)buf;
io_buf = (void *)&io_v4;
} else {
+ struct sg_io_hdr io_hdr;
+
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);
@@
-348,13
+350,13
@@
resend:
io_buf = (void *)&io_hdr;
}
io_buf = (void *)&io_hdr;
}
- if (ioctl(fd, SG_IO, io_buf) < 0) {
- if (errno == EINVAL && dev_scsi->use_sg == 4) {
+ retval = ioctl(fd, SG_IO, io_buf);
+ if (retval < 0) {
+ if ((errno == EINVAL || errno == ENOSYS) && dev_scsi->use_sg == 4) {
dev_scsi->use_sg = 3;
goto resend;
}
info("%s: ioctl failed: %s\n", dev_scsi->kernel, strerror(errno));
dev_scsi->use_sg = 3;
goto resend;
}
info("%s: ioctl failed: %s\n", dev_scsi->kernel, strerror(errno));
- retval = -1;
goto error;
}
goto error;
}
@@
-776,10
+778,10
@@
static int do_scsi_page80_inquiry(struct scsi_id_device *dev_scsi, int fd,
int scsi_std_inquiry(struct scsi_id_device *dev_scsi, const char *devname)
{
int scsi_std_inquiry(struct scsi_id_device *dev_scsi, const char *devname)
{
- int retval;
int fd;
unsigned char buf[SCSI_INQ_BUFF_LEN];
struct stat statbuf;
int fd;
unsigned char buf[SCSI_INQ_BUFF_LEN];
struct stat statbuf;
+ int err = 0;
dbg("opening %s\n", devname);
fd = open(devname, O_RDONLY | O_NONBLOCK);
dbg("opening %s\n", devname);
fd = open(devname, O_RDONLY | O_NONBLOCK);
@@
-792,16
+794,18
@@
int scsi_std_inquiry(struct scsi_id_device *dev_scsi, const char *devname)
if (fstat(fd, &statbuf) < 0) {
info("scsi_id: cannot stat %s: %s\n",
devname, strerror(errno));
if (fstat(fd, &statbuf) < 0) {
info("scsi_id: cannot stat %s: %s\n",
devname, strerror(errno));
- return 2;
+ err = 2;
+ goto out;
}
sprintf(dev_scsi->kernel,"%d:%d", major(statbuf.st_rdev),
minor(statbuf.st_rdev));
memset(buf, 0, SCSI_INQ_BUFF_LEN);
}
sprintf(dev_scsi->kernel,"%d:%d", major(statbuf.st_rdev),
minor(statbuf.st_rdev));
memset(buf, 0, SCSI_INQ_BUFF_LEN);
-
retval
= scsi_inquiry(dev_scsi, fd, 0, 0, buf, SCSI_INQ_BUFF_LEN);
- if (
retval
< 0)
-
return retval
;
+
err
= scsi_inquiry(dev_scsi, fd, 0, 0, buf, SCSI_INQ_BUFF_LEN);
+ if (
err
< 0)
+
goto out
;
+ err = 0;
memcpy(dev_scsi->vendor, buf + 8, 8);
dev_scsi->vendor[8] = '\0';
memcpy(dev_scsi->model, buf + 16, 16);
memcpy(dev_scsi->vendor, buf + 8, 8);
dev_scsi->vendor[8] = '\0';
memcpy(dev_scsi->model, buf + 16, 16);
@@
-810,9
+814,9
@@
int scsi_std_inquiry(struct scsi_id_device *dev_scsi, const char *devname)
dev_scsi->revision[4] = '\0';
sprintf(dev_scsi->type,"%x", buf[0] & 0x1f);
dev_scsi->revision[4] = '\0';
sprintf(dev_scsi->type,"%x", buf[0] & 0x1f);
+out:
close(fd);
close(fd);
-
- return 0;
+ return err;
}
int scsi_get_serial (struct scsi_id_device *dev_scsi, const char *devname,
}
int scsi_get_serial (struct scsi_id_device *dev_scsi, const char *devname,
@@
-922,8
+926,8
@@
int scsi_get_serial (struct scsi_id_device *dev_scsi, const char *devname,
goto completed;
}
retval = 1;
goto completed;
}
retval = 1;
+
completed:
completed:
- if (close(fd) < 0)
- info("%s: close failed: %s\n", dev_scsi->kernel, strerror(errno));
+ close(fd);
return retval;
}
return retval;
}