Commit 2b3b3d61 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

osst: call scsi_set_medium_removal directly 



Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
parent dccfa688

drivers/scsi/osst.c

+6 −7
Original line number Diff line number Diff line
@@ -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;

}