block: Remove an obsolete comment from sg_io()

[linux-2.6-microblaze.git] / block / scsi_ioctl.c

diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index 6599bac..1b3fe99 100644 (file)
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -353,10 +353,6 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk,
 
        start_time = jiffies;
 
-       /* ignore return value. All information is passed back to caller
-        * (if he doesn't check that is his problem).
-        * N.B. a non-zero SCSI status is _not_ necessarily an error.
-        */
        blk_execute_rq(bd_disk, rq, at_head);
 
        hdr->duration = jiffies_to_msecs(jiffies - start_time);
@@ -431,7 +427,7 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
 
        bytes = max(in_len, out_len);
        if (bytes) {
-               buffer = kzalloc(bytes, q->bounce_gfp | GFP_USER| __GFP_NOWARN);
+               buffer = kzalloc(bytes, GFP_NOIO | GFP_USER | __GFP_NOWARN);
                if (!buffer)
                        return -ENOMEM;