Merge tag 'v3.10.107' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / scsi / scsi_lib.c

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 60031e15d562b4aa86c92a6003b488d9f49c60ee..dc1c2f4520f2e2507f6bfd7b1264d6bfe47a4030 100644 (file)
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1009,8 +1009,12 @@ static int scsi_init_sgtable(struct request *req, struct scsi_data_buffer *sdb,
 int scsi_init_io(struct scsi_cmnd *cmd, gfp_t gfp_mask)
 {
        struct request *rq = cmd->request;
+       int error;
 
-       int error = scsi_init_sgtable(rq, &cmd->sdb, gfp_mask);
+       if (WARN_ON_ONCE(!rq->nr_phys_segments))
+               return -EINVAL;
+
+       error = scsi_init_sgtable(rq, &cmd->sdb, gfp_mask);
        if (error)
                goto err_exit;
 
@@ -1102,11 +1106,7 @@ int scsi_setup_blk_pc_cmnd(struct scsi_device *sdev, struct request *req)
         * submit a request without an attached bio.
         */
        if (req->bio) {
-               int ret;
-
-               BUG_ON(!req->nr_phys_segments);
-
-               ret = scsi_init_io(cmd, GFP_ATOMIC);
+               int ret = scsi_init_io(cmd, GFP_ATOMIC);
                if (unlikely(ret))
                        return ret;
        } else {
@@ -1150,11 +1150,6 @@ int scsi_setup_fs_cmnd(struct scsi_device *sdev, struct request *req)
                        return ret;
        }
 
-       /*
-        * Filesystem requests must transfer data.
-        */
-       BUG_ON(!req->nr_phys_segments);
-
        cmd = scsi_get_cmd_from_req(sdev, req);
        if (unlikely(!cmd))
                return BLKPREP_DEFER;