From patchwork Wed Apr 5 18:06:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 9665375 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 0F7B760364 for ; Wed, 5 Apr 2017 18:08:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0884728595 for ; Wed, 5 Apr 2017 18:08:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F1362285A7; Wed, 5 Apr 2017 18:08:08 +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.4 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM 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 7CBF5285A1 for ; Wed, 5 Apr 2017 18:08:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756055AbdDESHx (ORCPT ); Wed, 5 Apr 2017 14:07:53 -0400 Received: from mail-it0-f54.google.com ([209.85.214.54]:35487 "EHLO mail-it0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754473AbdDESG4 (ORCPT ); Wed, 5 Apr 2017 14:06:56 -0400 Received: by mail-it0-f54.google.com with SMTP id y18so87871609itc.0 for ; Wed, 05 Apr 2017 11:06:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=OI9Kri3ip2doPMOZfrdpPQLtekMc1ibDFg1ap/KmYdo=; b=yRFeG0fBC5eekzQzBOmiTgRg4Pv+1SP+XxiaUAgbfx0l6hMCv5rGZbdal+x8++zr3/ Hx84+9Gr36NeC0WpIapwUfe9w/a0Xs+CqSMEWrqv9w3aTBAXPqR7AyPdw0n+UQY9JQ5V cd83AF7pBJam+dLARxvnVDgcR6n4kWTmZbPsCbDhWjz97AvKPUvTm1WCGqjFnKs0v0/1 Vr3sexHsupcwRRL5X/cRrE90NRO/HBzvcZFvNAazfU3mCSNTbeqt2vvupesFThfiHSNU hX12k0fdZvheIrPoTYAA/wGqK/vBqqM8+gVgDuAaCG/EC2EUu5sI1J2+AKhxCZcscOZ3 w89A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=OI9Kri3ip2doPMOZfrdpPQLtekMc1ibDFg1ap/KmYdo=; b=Vlv463ZtvZGY/Sy1cGhgdGK6shOiUMcw6C0M5EZoplRmuCU3wFNtivktwS437xV1nB 04nlABi3COjslEBIH0Z9+jNXfTgifMA2l+Rz/kTCiYitWFmr+kRXW+MuML1ij8AKWhmG 7Ye2dTnfO833SDeWT2ylwiPU4CucfT8gRptaR4FnqHPXizgIo83s6HN2ONYUXYlIbmxN TYZm/OXGkIDGsR2YCPyoks0bQIJ2Az2McEt4TmA0ONoXZhL/4n+w4KRxql4NzcVDqMP+ ukFj+GKV4/P9QEe7OvDpry6qQykMXJ9DaXslmHc3We/16FK41zJOei4sbJ1M1UCOZyTI wfaQ== X-Gm-Message-State: AFeK/H1aiBWC8jm10YjxhtCXCX33DkEyLxa65UN7kjQQ5tgBtZcxniYa RR2sTKvUrNkGCg== X-Received: by 10.36.11.6 with SMTP id 6mr21675357itd.119.1491415615655; Wed, 05 Apr 2017 11:06:55 -0700 (PDT) Received: from localhost ([216.160.245.98]) by smtp.gmail.com with ESMTPSA id f130sm10877410iof.2.2017.04.05.11.06.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Apr 2017 11:06:55 -0700 (PDT) Date: Wed, 5 Apr 2017 12:06:53 -0600 From: Jens Axboe To: Christoph Hellwig Cc: Keith Busch , Sagi Grimberg , linux-nvme@lists.infradead.org, linux-block@vger.kernel.org, linux-scsi@vger.kernel.org Subject: Re: ->retries fixups V2 Message-ID: <20170405180653.GA5548@kernel.dk> References: <20170405171812.19911-1-hch@lst.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20170405171812.19911-1-hch@lst.de> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Wed, Apr 05 2017, Christoph Hellwig wrote: > This series fixes a few lose bits in terms of how nvme uses ->retries, > including fixing it for non-PCIe transports. While at it I noticed that > nvme and scsi use the field in entirely different ways, and no other > driver uses it at all. So I decided to move it into the nvme_request and > scsi_request structures instead. > > Changes since V1: > - better changelog for one patch > - move the new retries field to the end of struct nvme_request Applied for 4.12. If we do the below on my box, we remove the (now) 2 holes from struct request and shrink it 8 bytes. Reviewed-by: Christoph Hellwig diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index ce6f9a6534c9..3cf241b0814d 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -215,6 +215,8 @@ struct request { unsigned short ioprio; + unsigned int timeout; + void *special; /* opaque pointer available for LLD use */ int errors; @@ -223,7 +225,6 @@ struct request { unsigned long deadline; struct list_head timeout_list; - unsigned int timeout; /* * completion callback.