summaryrefslogtreecommitdiff
path: root/drivers/scsi/sg.c
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2008-09-02 17:50:08 +0400
committerJens Axboe <jens.axboe@oracle.com>2008-10-09 10:56:16 +0400
commit4677735f03f5b6b6f2182f457a921855cadfb85b (patch)
treea5fc6c16ccb0a2050ea714f93f1ad79a8d1f9689 /drivers/scsi/sg.c
parent0b6cb26c6686f1f24607c41f0a6d21ce54191710 (diff)
downloadlinux-4677735f03f5b6b6f2182f457a921855cadfb85b.tar.xz
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: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/scsi/sg.c')
-rw-r--r--drivers/scsi/sg.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index df8bf67b171a..ba9b9bbd4e73 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -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) {