[scsi] Make LUN a property of the SCSI backend only

Nothing within the SCSI core actually refers to the LUN, so we can
simplify matters by treating it as purely a property of the backend.

diff --git a/src/include/gpxe/scsi.h b/src/include/gpxe/scsi.h
index 9131a29..9741697 100644 (file)
--- a/src/include/gpxe/scsi.h
+++ b/src/include/gpxe/scsi.h
@@ -253,8 +253,6 @@ struct scsi_lun {
 struct scsi_device {
        /** Block device interface */
        struct block_device blockdev;
-       /** Logical unit number (LUN) */
-       struct scsi_lun lun;
        /**
         * Issue SCSI command
         *

diff --git a/src/net/tcp/iscsi.c b/src/net/tcp/iscsi.c
index 74da05d..771384b 100644 (file)
--- a/src/net/tcp/iscsi.c
+++ b/src/net/tcp/iscsi.c
@@ -1763,7 +1763,6 @@ int iscsi_attach ( struct scsi_device *scsi, const char *root_path ) {
        /* Attach parent interface, mortalise self, and return */
        scsi->backend = ref_get ( &iscsi->refcnt );
        scsi->command = iscsi_command;
-       scsi->lun = iscsi->lun;
        ref_put ( &iscsi->refcnt );
        return 0;