From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754279AbcAVQ3n (ORCPT ); Fri, 22 Jan 2016 11:29:43 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:50870 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751504AbcAVQ3k (ORCPT ); Fri, 22 Jan 2016 11:29:40 -0500 Subject: Re: [GIT PULL] NVMe changes for 4.5-rc1 To: Linus Torvalds References: <20160121212738.GA15727@kernel.dk> <56A251C2.101@fb.com> CC: Linux Kernel Mailing List , Keith Busch , From: Jens Axboe Message-ID: <56A258F1.1060207@fb.com> Date: Fri, 22 Jan 2016 09:29:37 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [192.168.54.13] X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-01-22_06:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 01/22/2016 09:26 AM, Linus Torvalds wrote: > > On Jan 22, 2016 7:59 AM, "Jens Axboe" > wrote: > >> > >> - nvme_dev_remove() got renamed to nvme_remove_namespaces(), but also > >> lost the "dev" argument (it takes "struct nvme_ctrl *ctrl" now). > > > > &dev->ctrl > > That's not the problem - the code does that already. > > But we want the dev argument *back*, since the function now wants to do > that nvme_io_incapable() check and then cancel the IO on it. > > And I didn't know if you guys would want to use container_of() or just > change the calling convention back to using "dev", or perhaps just > decide to do the IO cleanup in the caller instead. That last option > seems the cleanest, since now nvme_dev_remove_namespaces() is just about > the namespace, and maybe it would be better to re-introduce a whole new > nvme_dev_remove() that does the old thing. The latter is the cleanest approach, we'll get it fixed up. > So I decided to not do anything at all, and just let you guys sorry it > out instead. Is that like a Canadian duel? -- Jens Axboe