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

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

[SCSI] st: convert st_int_ioctl to use st_scsi_kern_execute 



This replaces st_do_scsi in st_int_ioctl 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 7a31ec3c

drivers/scsi/st.c

+6 −3
Original line number Diff line number Diff line
@@ -2852,11 +2852,14 @@ static int st_int_ioctl(struct scsi_tape *STp, unsigned int cmd_in, unsigned lon 
		return (-ENOSYS);

	}



	SRpnt = st_do_scsi(NULL, STp, cmd, datalen, direction,

			   timeout, MAX_RETRIES, 1);

	SRpnt = st_allocate_request(STp);

	if (!SRpnt)

		return (STp->buffer)->syscall_result;



	ioctl_result = st_scsi_kern_execute(SRpnt, cmd, direction,

					    STp->buffer->b_data, datalen,

					    timeout, MAX_RETRIES);

	if (!ioctl_result)

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



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