scsi: stop passing a gfp_mask argument down the command setup path

[deliverable/linux.git] / drivers / scsi / sd.c

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 95bfb7bfbb9d7bcee9d83f38e3b83d60be95d8c9..f2e9b1dad5745afce19afd8a1d6a103df662a8d9 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -786,7 +786,7 @@ static int sd_setup_discard_cmnd(struct scsi_cmnd *cmd)
         * amount of blocks described by the request.
         */
        blk_add_request_payload(rq, page, len);
-       ret = scsi_init_io(cmd, GFP_ATOMIC);
+       ret = scsi_init_io(cmd);
        rq->__data_len = nr_bytes;
 
 out:
@@ -880,7 +880,7 @@ static int sd_setup_write_same_cmnd(struct scsi_cmnd *cmd)
         * knows how much to actually write.
         */
        rq->__data_len = sdp->sector_size;
-       ret = scsi_init_io(cmd, GFP_ATOMIC);
+       ret = scsi_init_io(cmd);
        rq->__data_len = nr_bytes;
        return ret;
 }
@@ -914,7 +914,7 @@ static int sd_setup_read_write_cmnd(struct scsi_cmnd *SCpnt)
        int ret;
        unsigned char protect;
 
-       ret = scsi_init_io(SCpnt, GFP_ATOMIC);
+       ret = scsi_init_io(SCpnt);
        if (ret != BLKPREP_OK)
                goto out;
        SCpnt = rq->special;