From patchwork Fri Jun 5 12:54:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Matias_Bj=C3=B8rling?= X-Patchwork-Id: 6553391 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B976D9F1C1 for ; Fri, 5 Jun 2015 12:57:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DCCA3206FF for ; Fri, 5 Jun 2015 12:57:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F085D206FE for ; Fri, 5 Jun 2015 12:57:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753110AbbFEM4z (ORCPT ); Fri, 5 Jun 2015 08:56:55 -0400 Received: from mail-la0-f48.google.com ([209.85.215.48]:34897 "EHLO mail-la0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754396AbbFEMyv (ORCPT ); Fri, 5 Jun 2015 08:54:51 -0400 Received: by labko7 with SMTP id ko7so53604462lab.2 for ; Fri, 05 Jun 2015 05:54:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bjorling.me; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=AxlebwqPIG5XD9SFWglUiivhvsmPgLlGAjXNaKQm0iU=; b=C9qqDaUk5q3pbqfkX+K0ksLZoJVejrmmRq56ZNsXVd+GPsDm9irIFGU5rYcZ7ADHcU kAiq8ux8+KDW3wAjM3VQ73iSPv7J5DPE+6nWXONc1Ktd7VzLCujJP7pQcZEnLKlfONAS jhWQb//H1BmseBZIZVmzLslucGQfZzl0RAbak= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=AxlebwqPIG5XD9SFWglUiivhvsmPgLlGAjXNaKQm0iU=; b=UJyFxXJrwfJCXcyv8Lx25LpDiCE1hpSnPI9RYSmHXcG0ocFQflnL7XNau21KePpXgt 6F2qlH9IW6TuaZSJqI/PQMe7vdVBOomxUlY7j2tudTk/x1Yg+o1krA6xJi/c9BFk3vJu 9X9MOY348G6H5OfNr4LTV9JH30ZympoGcYndnVAt9xeaaaRNqhpst9ozM+RqBiC7VoWI C4Qn+IDTgih3d/OYsTj34G6X8eIldobfQrXCc/UMhVUiiXvKF5tDhsRTlS9ytfL9A7xW Zz9w5ChIYysTo+HcFDS6j7HJAEGv3mZgE/FId4+V0o2QjpJxs9BRn8W30y1cBbtQum2h rH0A== X-Gm-Message-State: ALoCoQlX0dW5THW3Cm5VeUuozl0apEa/lvJvpJT4g9XxjoUDyHQbEoP9hJgksO1kaoqulQz2z0ya X-Received: by 10.112.202.36 with SMTP id kf4mr3340439lbc.0.1433508890301; Fri, 05 Jun 2015 05:54:50 -0700 (PDT) Received: from macroninja.itu.dk ([130.226.133.111]) by mx.google.com with ESMTPSA id t15sm1751522lbk.0.2015.06.05.05.54.48 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 05 Jun 2015 05:54:49 -0700 (PDT) From: =?UTF-8?q?Matias=20Bj=C3=B8rling?= To: hch@infradead.org, axboe@fb.com, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org Cc: javier@lightnvm.io, Stephen.Bates@pmcs.com, keith.busch@intel.com, =?UTF-8?q?Matias=20Bj=C3=B8rling?= Subject: [PATCH v4 2/8] nvme: don't overwrite req->cmd_flags on sync cmd Date: Fri, 5 Jun 2015 14:54:24 +0200 Message-Id: <1433508870-28251-3-git-send-email-m@bjorling.me> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1433508870-28251-1-git-send-email-m@bjorling.me> References: <1433508870-28251-1-git-send-email-m@bjorling.me> MIME-Version: 1.0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In __nvme_submit_sync_cmd, the request direction is overwritten when the REQ_FAILFAST_DRIVER flag is set. Signed-off-by: Matias Bjørling Reviewed-by: Christoph Hellwig --- drivers/block/nvme-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c index d2955fe..6e433b1 100644 --- a/drivers/block/nvme-core.c +++ b/drivers/block/nvme-core.c @@ -1010,7 +1010,7 @@ int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd, return PTR_ERR(req); req->cmd_type = REQ_TYPE_DRV_PRIV; - req->cmd_flags = REQ_FAILFAST_DRIVER; + req->cmd_flags |= REQ_FAILFAST_DRIVER; req->__data_len = 0; req->__sector = (sector_t) -1; req->bio = req->biotail = NULL;