On 10/30/2014 10:27 AM, Christoph Hellwig wrote:
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> ---
> drivers/scsi/osst.c | 13 ++++++-------
> 1 file changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c
> index b6d63d6..8c38464 100644
> --- a/drivers/scsi/osst.c
> +++ b/drivers/scsi/osst.c
> @@ -3327,19 +3327,18 @@ static int osst_write_frame(struct osst_tape * STp, struct osst_request ** aSRpn
> /* Lock or unlock the drive door. Don't use when struct osst_request allocated. */
> static int do_door_lock(struct osst_tape * STp, int do_lock)
> {
> - int retval, cmd;
> + int retval;
>
> - cmd = do_lock ? SCSI_IOCTL_DOORLOCK : SCSI_IOCTL_DOORUNLOCK;
> #if DEBUG
> printk(OSST_DEB_MSG "%s:D: %socking drive door.\n", tape_name(STp), do_lock ? "L" : "Unl");
> #endif
> - retval = scsi_ioctl(STp->device, cmd, NULL);
> - if (!retval) {
> +
> + retval = scsi_set_medium_removal(STp->device,
> + do_lock ? SCSI_REMOVAL_PREVENT : SCSI_REMOVAL_ALLOW);
> + if (!retval)
> STp->door_locked = do_lock ? ST_LOCKED_EXPLICIT : ST_UNLOCKED;
> - }
> - else {
> + else
> STp->door_locked = ST_LOCK_FAILS;
> - }
> return retval;
> }
>
>
Reviewed-by: Hannes Reinecke <hare@xxxxxxx>
Cheers,
Hannes
--
Dr. Hannes Reinecke zSeries & Storage
hare@xxxxxxx +49 911 74053 688
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 21284 (AG Nürnberg)
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
