projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
block: introduce struct rq_map_data to use reserved pages
[linux-2.6-microblaze.git]
/
block
/
scsi_ioctl.c
diff --git
a/block/scsi_ioctl.c
b/block/scsi_ioctl.c
index
f49d6a1
..
c34272a
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;
}
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)
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)
GFP_KERNEL);
if (ret)