Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751916AbdI1Th0 (ORCPT ); Thu, 28 Sep 2017 15:37:26 -0400 Received: from smtp.nue.novell.com ([195.135.221.5]:38425 "EHLO smtp.nue.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750943AbdI1ThX (ORCPT ); Thu, 28 Sep 2017 15:37:23 -0400 From: Martin Wilck To: Jens Axboe , Christoph Hellwig , Johannes Thumshirn Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Hannes Reinecke , linux-nvme@lists.infradead.org, Martin Wilck Subject: [PATCH 2/2] nvme: use device_add_disk_with_groups() Date: Thu, 28 Sep 2017 21:36:37 +0200 Message-Id: <20170928193637.24707-2-mwilck@suse.com> X-Mailer: git-send-email 2.14.0 In-Reply-To: <20170928193637.24707-1-mwilck@suse.com> References: <20170928193637.24707-1-mwilck@suse.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1447 Lines: 41 By using device_add_disk_with_groups(), we can avoid the race condition with udev rule processing, because no udev event will be triggered before all attributes are available. Signed-off-by: Martin Wilck --- drivers/nvme/host/core.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 5a14cc7f28ee..e7289a727715 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -2156,6 +2156,11 @@ static const struct attribute_group nvme_ns_attr_group = { .is_visible = nvme_ns_attrs_are_visible, }; +static const struct attribute_group *nvme_ns_attr_groups[] = { + &nvme_ns_attr_group, + NULL, +}; + #define nvme_show_str_function(field) \ static ssize_t field##_show(struct device *dev, \ struct device_attribute *attr, char *buf) \ @@ -2405,11 +2410,8 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid) kfree(id); - device_add_disk(ctrl->device, ns->disk); - if (sysfs_create_group(&disk_to_dev(ns->disk)->kobj, - &nvme_ns_attr_group)) - pr_warn("%s: failed to create sysfs group for identification\n", - ns->disk->disk_name); + device_add_disk_with_groups(ctrl->device, ns->disk, + nvme_ns_attr_groups); if (ns->ndev && nvme_nvm_register_sysfs(ns)) pr_warn("%s: failed to register lightnvm sysfs group for identification\n", ns->disk->disk_name); -- 2.14.0