Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[scsi] Generalise iscsi_detached_command() to scsi_detached_command()
  • Loading branch information
Michael Brown committed Aug 10, 2009
1 parent 04878ef commit 976f12c
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 6 deletions.
12 changes: 12 additions & 0 deletions src/drivers/block/scsi.c
Expand Up @@ -44,6 +44,18 @@ block_to_scsi ( struct block_device *blockdev ) {
return container_of ( blockdev, struct scsi_device, blockdev );
}

/**
* Handle SCSI command with no backing device
*
* @v scsi SCSI device
* @v command SCSI command
* @ret rc Return status code
*/
int scsi_detached_command ( struct scsi_device *scsi __unused,
struct scsi_command *command __unused ) {
return -ENODEV;
}

/**
* Issue SCSI command
*
Expand Down
2 changes: 2 additions & 0 deletions src/include/gpxe/scsi.h
Expand Up @@ -270,6 +270,8 @@ struct scsi_device {
struct refcnt *backend;
};

extern int scsi_detached_command ( struct scsi_device *scsi,
struct scsi_command *command );
extern int init_scsidev ( struct scsi_device *scsi );

#endif /* _GPXE_SCSI_H */
7 changes: 1 addition & 6 deletions src/net/tcp/iscsi.c
Expand Up @@ -1571,11 +1571,6 @@ static int iscsi_command ( struct scsi_device *scsi,
return 0;
}

static int iscsi_detached_command ( struct scsi_device *scsi __unused,
struct scsi_command *command __unused ) {
return -ENODEV;
}

/**
* Shut down iSCSI interface
*
Expand All @@ -1588,7 +1583,7 @@ void iscsi_detach ( struct scsi_device *scsi ) {
xfer_nullify ( &iscsi->socket );
iscsi_close_connection ( iscsi, 0 );
process_del ( &iscsi->process );
scsi->command = iscsi_detached_command;
scsi->command = scsi_detached_command;
ref_put ( scsi->backend );
scsi->backend = NULL;
}
Expand Down

0 comments on commit 976f12c

Please sign in to comment.