X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=block%2Fscsi_ioctl.c;h=e83f1dbf7c29a12563d18da1ae355929dcdde06e;hb=1abd727ed7abf5c19e7d1760671475cbecbccb0e;hp=65c6a3cba6d6e85d31d345dd75b322f7196889a5;hpb=30716e07ef511ec7525c07eb1e8060ba8943c2a2;p=mv-sheeva.git

diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index 65c6a3cba6d..e83f1dbf7c2 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)