Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15c920a6 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by James Bottomley
Browse files

[SCSI] st: convert do_load_unload to use st_scsi_kern_execute 



This replaces st_do_scsi in do_load_unload (START STOP) with
st_scsi_kern_execute.

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: default avatarKai Makisara <Kai.Makisara@kolumbus.fi>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 3c0bf16c

drivers/scsi/st.c

+9 −4
Original line number Original line Diff line number Diff line
@@ -2515,13 +2515,16 @@ static int do_load_unload(struct scsi_tape *STp, struct file *filp, int load_cod 
		printk(ST_DEB_MSG "%s: Loading tape.\n", name);

		printk(ST_DEB_MSG "%s: Loading tape.\n", name);

		);

		);





	SRpnt = st_do_scsi(NULL, STp, cmd, 0, DMA_NONE,

	SRpnt = st_allocate_request(STp);

			   timeout, MAX_RETRIES, 1);

	if (!SRpnt)

	if (!SRpnt)

		return (STp->buffer)->syscall_result;

		return STp->buffer->syscall_result;



	retval = st_scsi_kern_execute(SRpnt, cmd, DMA_NONE, NULL, 0, timeout,

				      MAX_RETRIES);

	if (retval)

		goto out;





	retval = (STp->buffer)->syscall_result;

	retval = (STp->buffer)->syscall_result;

	st_release_request(SRpnt);





	if (!retval) {	/* SCSI command successful */

	if (!retval) {	/* SCSI command successful */
@@ -2540,6 +2543,8 @@ static int do_load_unload(struct scsi_tape *STp, struct file *filp, int load_cod 
		STps = &(STp->ps[STp->partition]);

		STps = &(STp->ps[STp->partition]);

		STps->drv_file = STps->drv_block = (-1);

		STps->drv_file = STps->drv_block = (-1);

	}

	}

out:

	st_release_request(SRpnt);





	return retval;

	return retval;

}

}