From patchwork Wed Sep 22 18:33:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 12511255 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9B28F3FC8 for ; Wed, 22 Sep 2021 18:36:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=P+wjbvfBuWtk4jFuBJ3sMrPTDi2tE+fy+MjarlqPFEo=; b=dUa/wMfpiL11jEQjmXr3Xz7vI5 IsLu4nmjfHVzzWC/5DJW9P7noCA6V1Tx8A9icmrEAA8GIQhnEqCp8sCIb1wNVnwHojJ52vrDTJEBq OtFNeNzSlzlQz1YxuJ4WVNmHDhiEN7N5aFNDMkB5D+jn2w+j/lBizGIw4b7ZzoJNym5Q5YxuhJu8l yzCh9Ec3vLT0P6ESk69Wvf05cq4ykXjp1p459TQAdd3dyehPdZfzhCEK6Hh4D5aIgceYQWfChyO9j NyYbZxDqrvhQM1fF0FeztIwRD6zOJhvhPNXVIDGdVhGHs0jp730IJkZ75BDAaqTAgYDp+WDwynthk hw1cIJ1g==; Received: from [2001:4bb8:184:72db:3a8e:1992:6715:6960] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1mT75k-0052QB-Dv; Wed, 22 Sep 2021 18:35:51 +0000 From: Christoph Hellwig To: Dan Williams , Jens Axboe Cc: Vishal Verma , Dave Jiang , Ira Weiny , linux-block@vger.kernel.org, nvdimm@lists.linux.dev Subject: [PATCH 3/3] block: warn if ->groups is set when calling add_disk Date: Wed, 22 Sep 2021 20:33:31 +0200 Message-Id: <20210922183331.2455043-4-hch@lst.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210922183331.2455043-1-hch@lst.de> References: <20210922183331.2455043-1-hch@lst.de> Precedence: bulk X-Mailing-List: nvdimm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html The proper API is to pass the groups to device_add_disk, but the code used to also allow groups being set before calling *add_disk. Warn about that but keep the group pointer intact for now so that it can be removed again after a grace period. Fixes: 52b85909f85d ("block: fold register_disk into device_add_disk") Signed-off-by: Christoph Hellwig Reviewed-by: Ira Weiny Reviewed-by: Dan Williams --- block/genhd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/block/genhd.c b/block/genhd.c index 7b6e5e1cf9564..409cf608cc5bd 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -439,7 +439,8 @@ int device_add_disk(struct device *parent, struct gendisk *disk, dev_set_uevent_suppress(ddev, 1); ddev->parent = parent; - ddev->groups = groups; + if (!WARN_ON_ONCE(ddev->groups)) + ddev->groups = groups; dev_set_name(ddev, "%s", disk->disk_name); if (!(disk->flags & GENHD_FL_HIDDEN)) ddev->devt = MKDEV(disk->major, disk->first_minor);