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

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

[SCSI] st: move st_request initialization to st_allocate_request form st_do_scsi 



This moves st_request initialization code to st_allocate_request()
form st_do_scsi(). This is a preparation for making
st_allocate_request() usable for everyone, not only st_do_scsi().

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 5d2711c0

drivers/scsi/st.c

+19 −13
Original line number Diff line number Diff line
@@ -451,9 +451,23 @@ static void st_sleep_done(void *data, char *sense, int result, int resid) 
		complete(SRpnt->waiting);

}



static struct st_request *st_allocate_request(void)

static struct st_request *st_allocate_request(struct scsi_tape *stp)

{

	return kzalloc(sizeof(struct st_request), GFP_KERNEL);

	struct st_request *streq;



	streq = kzalloc(sizeof(*streq), GFP_KERNEL);

	if (streq)

		streq->stp = stp;

	else {

		DEBC(printk(KERN_ERR "%s: Can't get SCSI request.\n",

			    tape_name(stp)););

		if (signal_pending(current))

			stp->buffer->syscall_result = -EINTR;

		else

			stp->buffer->syscall_result = -EBUSY;

	}



	return streq;

}



static void st_release_request(struct st_request *streq)
@@ -481,19 +495,11 @@ st_do_scsi(struct st_request * SRpnt, struct scsi_tape * STp, unsigned char *cmd 
		return NULL;

	}



	if (SRpnt == NULL) {

		SRpnt = st_allocate_request();

		if (SRpnt == NULL) {

			DEBC( printk(KERN_ERR "%s: Can't get SCSI request.\n",

				     tape_name(STp)); );

			if (signal_pending(current))

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

			else

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

	if (!SRpnt) {

		SRpnt = st_allocate_request(STp);

		if (!SRpnt)

			return NULL;

	}

		SRpnt->stp = STp;

	}



	/* If async IO, set last_SRpnt. This ptr tells write_behind_check

	   which IO is outstanding. It's nulled out when the IO completes. */