NFS: rename nfs_client_kobj to nfs_net_kobj

Match the variable names to the sysfs structure.

Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>

diff --git a/fs/nfs/sysfs.c b/fs/nfs/sysfs.c
index 81d98727b79fd6a0b8186c58f906f5eb40f6fd9a..8f89aeca6272b8aa1b978784bc7687b694b45ef7 100644 (file)
--- 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 5501ef573c3274dc7a2342cade1dea1f52948b59..0423aaf388c92b80df9f946dcf3efce31be8f720 100644 (file)
--- 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);