1 files changed, 5 insertions, 3 deletions

diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index ec4b7f234626..c34272a348fe 100644
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -185,6 +185,7 @@ void blk_set_cmd_filter_defaults(struct blk_cmd_filter *filter)
         __set_bit(GPCMD_PREVENT_ALLOW_MEDIUM_REMOVAL, filter->write_ok);
         __set_bit(GPCMD_LOAD_UNLOAD, filter->write_ok);
         __set_bit(GPCMD_SET_STREAMING, filter->write_ok);
+        __set_bit(GPCMD_SET_READ_AHEAD, filter->write_ok);
 }
 EXPORT_SYMBOL_GPL(blk_set_cmd_filter_defaults);
 
@@ -313,11 +314,12 @@ 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,
-                                          hdr->dxfer_len);
+                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)
                 goto out;