[SCSI] 3w-xxxx: remove unnecessary local_irq_save/restore for scsi sg copy API

[linux-2.6-omap-h63xx.git] / block / scsi_ioctl.c

diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index f49d6a11a69e29de19c5f4ce90c326eeaf4622a7..c34272a348fe07fd22aec5c8d8ccc55c37cddf64 100644 (file)
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -314,11 +314,11 @@ static int sg_io(struct file *file, struct request_queue *q,
                        goto out;
                }
 
-               ret = blk_rq_map_user_iov(q, rq, iov, hdr->iovec_count,
+               ret = blk_rq_map_user_iov(q, rq, NULL, iov, hdr->iovec_count,
                                          hdr->dxfer_len, GFP_KERNEL);
                kfree(iov);
        } else if (hdr->dxfer_len)
-               ret = blk_rq_map_user(q, rq, hdr->dxferp, hdr->dxfer_len,
+               ret = blk_rq_map_user(q, rq, NULL, hdr->dxferp, hdr->dxfer_len,
                                      GFP_KERNEL);
 
        if (ret)