Received: by 2002:a05:6358:9144:b0:117:f937:c515 with SMTP id r4csp2540722rwr; Fri, 21 Apr 2023 10:11:41 -0700 (PDT) X-Google-Smtp-Source: AKy350Yx7sAjDkVL9N2iMr7is/dUIw0NfWUHqRM/OF0wytzb/Q8IauxGVZB/3IciZumuXKBLizRU X-Received: by 2002:a92:db12:0:b0:328:213e:4cc9 with SMTP id b18-20020a92db12000000b00328213e4cc9mr4828982iln.26.1682097101375; Fri, 21 Apr 2023 10:11:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682097101; cv=none; d=google.com; s=arc-20160816; b=A2TaCPC8UaEFHLrMhkip4O+pXTJ8+onvT+z1H9o9tzwEj4y/mhDa5YNNhKuyfz5sDR zH+D0q+SGQZ6hT+D1q/3dhoNAGYViUuoDwU8+r19J8ezRTKfC8WfT70juyl+ejNzXoe4 gGgcGKqbDpo0znQZxWd8oDWoszx9wLlyjmYTJw6f7Sr1w3C4YslWfADKMoq71dd3gOYH XqmDYhCBBJ2n9W/yt7d+qic0uKjpdYGNpeGprE2wZtPg+i62P6VuBUUM8sdzhOzXapbm dZu8ipi8ypcH/aH8O5ToEAG/6gmPr+qqFBIWIN0JjHCkeFXOoc0LjlKWO2BGG2qGAbsG EtjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=RjShONusOdEpIJwGrDOuO3fRc0vE5MoNwmON3dpd1WA=; b=iHPKKND4rSUGBFc/wHW/rhMzEd0HRNKbYtqfWM0oEsCBEmlY2SlFqs9+AUGNBpiDrH BySi4HMo4pU11Gypq4vdGKe/unXHjHQ+1w++bHAWo94cGozk9ixWYV0rmdR6z0MKYUwx nYIg/zKVMHdR1STZhDYFxlekjoQYh1fXP+yLhZ8MFYXj9K6N+Jtczr4Mx4D0B5RX5RLb i0Nwa7qlD+1+AAuQbqWob3CnlbBeEGnfs5oOR8YrUTbnlBK/mADVofiP6Kj5iLC5iqgL DnN2KFYHIKGxb+x+w9t79Y061M6UggkVkPsSRd6tMPQfNuisSEshN69oW1jdhHrjpheN AAjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=MoCrqEEt; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r13-20020a92d44d000000b00326309db713si4239214ilm.84.2023.04.21.10.11.26; Fri, 21 Apr 2023 10:11:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=MoCrqEEt; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233236AbjDURJb (ORCPT + 99 others); Fri, 21 Apr 2023 13:09:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233247AbjDURJ3 (ORCPT ); Fri, 21 Apr 2023 13:09:29 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC03DC172 for ; Fri, 21 Apr 2023 10:08:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682096897; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RjShONusOdEpIJwGrDOuO3fRc0vE5MoNwmON3dpd1WA=; b=MoCrqEEtB29Csn7yPgMTrAsLmrXuKuiYSEE5080TNbwu8O4VECPBoht9IpSkhYqQG1VBrF qbewT9N35Te5ff6pD/2nwNLc5W7ck4ZSP+as9lKx+2HRTmQi8eJWvuiAMyGu+bE1QQmEoZ OHEzZ0ovGOzGtBnbd62PZungNnHDjdc= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-633-3Zw7Wv_BO-O6jN8j5hgpAA-1; Fri, 21 Apr 2023 13:08:15 -0400 X-MC-Unique: 3Zw7Wv_BO-O6jN8j5hgpAA-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EB0A4800B35 for ; Fri, 21 Apr 2023 17:08:14 +0000 (UTC) Received: from bcodding.csb.redhat.com (ovpn-0-3.rdu2.redhat.com [10.22.0.3]) by smtp.corp.redhat.com (Postfix) with ESMTP id 94421492C13 for ; Fri, 21 Apr 2023 17:08:14 +0000 (UTC) From: Benjamin Coddington To: linux-nfs@vger.kernel.org Subject: [PATCH 2/9] NFS: rename nfs_client_kobj to nfs_net_kobj Date: Fri, 21 Apr 2023 13:08:05 -0400 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Match the variable names to the sysfs structure. Signed-off-by: Benjamin Coddington --- fs/nfs/sysfs.c | 10 +++++----- fs/nfs/sysfs.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fs/nfs/sysfs.c b/fs/nfs/sysfs.c index 81d98727b79f..a496e26fcfb7 100644 --- a/fs/nfs/sysfs.c +++ b/fs/nfs/sysfs.c @@ -17,7 +17,7 @@ #include "netns.h" #include "sysfs.h" -struct kobject *nfs_client_kobj; +struct kobject *nfs_net_kobj; static struct kset *nfs_kset; static void nfs_netns_object_release(struct kobject *kobj) @@ -58,8 +58,8 @@ int nfs_sysfs_init(void) nfs_kset = kset_create_and_add("nfs", NULL, fs_kobj); if (!nfs_kset) return -ENOMEM; - nfs_client_kobj = nfs_netns_object_alloc("net", nfs_kset, NULL); - if (!nfs_client_kobj) { + nfs_net_kobj = nfs_netns_object_alloc("net", nfs_kset, NULL); + if (!nfs_net_kobj) { kset_unregister(nfs_kset); nfs_kset = NULL; return -ENOMEM; @@ -69,7 +69,7 @@ int nfs_sysfs_init(void) void nfs_sysfs_exit(void) { - kobject_put(nfs_client_kobj); + kobject_put(nfs_net_kobj); kset_unregister(nfs_kset); } @@ -172,7 +172,7 @@ void nfs_netns_sysfs_setup(struct nfs_net *netns, struct net *net) { struct nfs_netns_client *clp; - clp = nfs_netns_client_alloc(nfs_client_kobj, net); + clp = nfs_netns_client_alloc(nfs_net_kobj, net); if (clp) { netns->nfs_client = clp; kobject_uevent(&clp->kobject, KOBJ_ADD); diff --git a/fs/nfs/sysfs.h b/fs/nfs/sysfs.h index 5501ef573c32..0423aaf388c9 100644 --- a/fs/nfs/sysfs.h +++ b/fs/nfs/sysfs.h @@ -14,7 +14,7 @@ struct nfs_netns_client { const char __rcu *identifier; }; -extern struct kobject *nfs_client_kobj; +extern struct kobject *nfs_net_kobj; extern int nfs_sysfs_init(void); extern void nfs_sysfs_exit(void); -- 2.39.2