From patchwork Tue Jun 14 14:27:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 9175941 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 90A1B60868 for ; Tue, 14 Jun 2016 14:27:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8227B265B9 for ; Tue, 14 Jun 2016 14:27:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7702B2824A; Tue, 14 Jun 2016 14:27:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 70AC02793B for ; Tue, 14 Jun 2016 14:27:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751728AbcFNO12 (ORCPT ); Tue, 14 Jun 2016 10:27:28 -0400 Received: from bombadil.infradead.org ([198.137.202.9]:47471 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752768AbcFNO1Z (ORCPT ); Tue, 14 Jun 2016 10:27:25 -0400 Received: from hch by bombadil.infradead.org with local (Exim 4.80.1 #2 (Red Hat Linux)) id 1bCpJJ-0004ct-JG; Tue, 14 Jun 2016 14:27:21 +0000 Date: Tue, 14 Jun 2016 07:27:21 -0700 From: Christoph Hellwig To: Christoph Hellwig Cc: keith.busch@intel.com, axboe@kernel.dk, linux-block@vger.kernel.org, ming.l@ssi.samsung.com, linux-nvme@lists.infradead.org, sagi@lightbits.io Subject: Re: [PATCH 04/11] nvmet: update for req_op changes Message-ID: <20160614142721.GA17219@infradead.org> References: <1465389066-19119-1-git-send-email-hch@lst.de> <1465389066-19119-5-git-send-email-hch@lst.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1465389066-19119-5-git-send-email-hch@lst.de> User-Agent: Mutt/1.5.24 (2015-08-30) X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP FYI, this missed half of the fixups, here is the other half: --- From c5caa4c7c3ad5f9648e18f42687c0b63885f428d Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Tue, 14 Jun 2016 09:27:53 +0200 Subject: nvmet: more fixups for the op vs flags split Signed-off-by: Christoph Hellwig --- drivers/nvme/target/io-cmd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/nvme/target/io-cmd.c b/drivers/nvme/target/io-cmd.c index 4cfd481..2cd069b6 100644 --- a/drivers/nvme/target/io-cmd.c +++ b/drivers/nvme/target/io-cmd.c @@ -73,6 +73,7 @@ static void nvmet_execute_rw(struct nvmet_req *req) bio->bi_iter.bi_sector = sector; bio->bi_private = req; bio->bi_end_io = nvmet_bio_done; + bio_set_op_attrs(bio, op, op_flags); for_each_sg(req->sg, sg, req->sg_cnt, i) { while (bio_add_page(bio, sg_page(sg), sg->length, sg->offset) @@ -107,7 +108,7 @@ static void nvmet_execute_flush(struct nvmet_req *req) bio->bi_bdev = req->ns->bdev; bio->bi_private = req; bio->bi_end_io = nvmet_bio_done; - bio->bi_rw = WRITE_FLUSH; + bio_set_op_attrs(bio, REQ_OP_WRITE, WRITE_FLUSH); submit_bio(bio); }