2 files changed, 5 insertions, 1 deletions

diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c
index 38c293b987b7..cf8752abd61a 100644
--- a/block/ll_rw_blk.c
+++ b/block/ll_rw_blk.c
@@ -1925,6 +1925,8 @@ blk_init_queue_node(request_fn_proc *rfn, spinlock_t *lock, int node_id)
         blk_queue_max_hw_segments(q, MAX_HW_SEGMENTS);
         blk_queue_max_phys_segments(q, MAX_PHYS_SEGMENTS);
 
+        q->sg_reserved_size = INT_MAX;
+
         /*
          * all done
          */
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index 65c6a3cba6d6..e83f1dbf7c29 100644
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -78,7 +78,9 @@ static int sg_set_timeout(request_queue_t *q, int __user *p)
 
 static int sg_get_reserved_size(request_queue_t *q, int __user *p)
 {
-        return put_user(q->sg_reserved_size, p);
+        unsigned val = min(q->sg_reserved_size, q->max_sectors << 9);
+
+        return put_user(val, p);
 }
 
 static int sg_set_reserved_size(request_queue_t *q, int __user *p)