From 6b292e9d512adea074824bafd454b530c6950ae6 Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Tue, 2 Sep 2008 22:50:08 +0900 Subject: [PATCH] --- yaml --- r: 110534 b: refs/heads/master c: 4677735f03f5b6b6f2182f457a921855cadfb85b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/sg.c | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/[refs] b/[refs] index c6b1daf53aec..d83c43ae994b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b6cb26c6686f1f24607c41f0a6d21ce54191710 +refs/heads/master: 4677735f03f5b6b6f2182f457a921855cadfb85b diff --git a/trunk/drivers/scsi/sg.c b/trunk/drivers/scsi/sg.c index df8bf67b171a..ba9b9bbd4e73 100644 --- a/trunk/drivers/scsi/sg.c +++ b/trunk/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) {