From patchwork Tue Sep 30 19:13:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris J Arges X-Patchwork-Id: 395074 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id C85C51400A0; Wed, 1 Oct 2014 05:15:51 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1XZ2tl-00058g-4L; Tue, 30 Sep 2014 19:15:45 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1XZ2tf-00057I-7t for kernel-team@lists.ubuntu.com; Tue, 30 Sep 2014 19:15:39 +0000 Received: from cpe-173-174-67-34.austin.res.rr.com ([173.174.67.34] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1XZ2te-0001Vd-Tr for kernel-team@lists.ubuntu.com; Tue, 30 Sep 2014 19:15:39 +0000 From: Chris J Arges To: kernel-team@lists.ubuntu.com Subject: [Utopic][PATCH v2] UBUNTU: SAUCE: Revert "sd: don't use scsi_setup_blk_pc_cmnd for flush requests" Date: Tue, 30 Sep 2014 14:13:36 -0500 Message-Id: <1412104416-4017-1-git-send-email-chris.j.arges@canonical.com> X-Mailer: git-send-email 1.9.1 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com BugLink: http://bugs.launchpad.net/bugs/1375452 This reverts commit 32f7682bb0f71eaf88388e05af00cbc14edc9bd7. Note: this also keeps commit aac35036f7ab00b8cb2a4c99b42cffb33d98aa42. Signed-off-by: Chris J Arges Conflicts: drivers/scsi/sd.c --- drivers/scsi/sd.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index bb77c0e..c0f54d2 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -830,20 +830,14 @@ static int sd_setup_write_same_cmnd(struct scsi_device *sdp, struct request *rq) return ret; } -static int sd_setup_flush_cmnd(struct scsi_cmnd *cmd) +static int scsi_setup_flush_cmnd(struct scsi_device *sdp, struct request *rq) { - struct request *rq = cmd->request; - - /* flush requests don't perform I/O, zero the S/G table */ - memset(&cmd->sdb, 0, sizeof(cmd->sdb)); - - cmd->cmnd[0] = SYNCHRONIZE_CACHE; - cmd->cmd_len = 10; - cmd->transfersize = 0; - cmd->allowed = SD_MAX_RETRIES; - rq->timeout = rq->q->rq_timeout * SD_FLUSH_TIMEOUT_MULTIPLIER; - return BLKPREP_OK; + rq->retries = SD_MAX_RETRIES; + rq->cmd[0] = SYNCHRONIZE_CACHE; + rq->cmd_len = 10; + + return scsi_setup_blk_pc_cmnd(sdp, rq); } static void sd_uninit_command(struct scsi_cmnd *SCpnt) @@ -883,7 +877,7 @@ static int sd_init_command(struct scsi_cmnd *SCpnt) ret = sd_setup_write_same_cmnd(sdp, rq); goto out; } else if (rq->cmd_flags & REQ_FLUSH) { - ret = sd_setup_flush_cmnd(SCpnt); + ret = scsi_setup_flush_cmnd(sdp, rq); goto out; } ret = scsi_setup_fs_cmnd(sdp, rq);