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

Commit 4677735f authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Jens Axboe
Browse files

sg: remove unnecessary blk_rq_unmap_user



blk_rq_unmap_user in sg_finish_rem_req can take care of all the cases.

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 0b6cb26c
Loading
Loading
Loading
Loading
+0 −7
Original line number Diff line number Diff line
@@ -522,10 +522,6 @@ sg_new_read(Sg_fd * sfp, char __user *buf, size_t count, Sg_request * srp)
		err = -EFAULT;
		goto err_out;
	}
	if (srp->bio) {
		err = blk_rq_unmap_user(srp->bio);
		srp->bio = NULL;
	}
err_out:
	sg_finish_rem_req(srp);
	return (0 == err) ? count : err;
@@ -1844,9 +1840,6 @@ sg_read_oxfer(Sg_request * srp, char __user *outp, int num_read_xfer)
	if ((!outp) || (num_read_xfer <= 0))
		return 0;

	blk_rq_unmap_user(srp->bio);
	srp->bio = NULL;

	num = 1 << (PAGE_SHIFT + schp->page_order);
	for (k = 0; k < schp->k_use_sg && schp->pages[k]; k++) {
		if (num > num_read_xfer) {