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

Commit 541645be authored by Pete Zaitcev's avatar Pete Zaitcev Committed by Linus Torvalds
Browse files

ub: fix up the conversion to sg_init_table() 



Signed-off-by: default avatarPete Zaitcev <zaitcev@redhat.com>
Cc: "Oliver Pinter" <oliver.pntr@gmail.com>
Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f6a4c8bd

drivers/block/ub.c

+1 −1
Original line number Diff line number Diff line
@@ -657,7 +657,6 @@ static int ub_request_fn_1(struct ub_lun *lun, struct request *rq) 
	if ((cmd = ub_get_cmd(lun)) == NULL)

		return -1;

	memset(cmd, 0, sizeof(struct ub_scsi_cmd));

	sg_init_table(cmd->sgv, UB_MAX_REQ_SG);



	blkdev_dequeue_request(rq);
@@ -668,6 +667,7 @@ static int ub_request_fn_1(struct ub_lun *lun, struct request *rq) 
	/*

	 * get scatterlist from block layer

	 */

	sg_init_table(&urq->sgv[0], UB_MAX_REQ_SG);

	n_elem = blk_rq_map_sg(lun->disk->queue, rq, &urq->sgv[0]);

	if (n_elem < 0) {

		/* Impossible, because blk_rq_map_sg should not hit ENOMEM. */