Commit 8b18a2ed authored by Benjamin Coddington's avatar Benjamin Coddington Committed by Trond Myklebust
Browse files

NFS: rename nfs_client_kset to nfs_kset 



Be brief and match the subsystem name.  There's no need to distinguish this
kset variable from the server.

Signed-off-by: default avatarBenjamin Coddington <bcodding@redhat.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent c8407f2e

fs/nfs/sysfs.c

+8 −8
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include "sysfs.h"



struct kobject *nfs_client_kobj;

static struct kset *nfs_client_kset;

static struct kset *nfs_kset;



static void nfs_netns_object_release(struct kobject *kobj)

{
@@ -55,13 +55,13 @@ static struct kobject *nfs_netns_object_alloc(const char *name, 


int nfs_sysfs_init(void)

{

	nfs_client_kset = kset_create_and_add("nfs", NULL, fs_kobj);

	if (!nfs_client_kset)

	nfs_kset = kset_create_and_add("nfs", NULL, fs_kobj);

	if (!nfs_kset)

		return -ENOMEM;

	nfs_client_kobj = nfs_netns_object_alloc("net", nfs_client_kset, NULL);

	nfs_client_kobj = nfs_netns_object_alloc("net", nfs_kset, NULL);

	if  (!nfs_client_kobj) {

		kset_unregister(nfs_client_kset);

		nfs_client_kset = NULL;

		kset_unregister(nfs_kset);

		nfs_kset = NULL;

		return -ENOMEM;

	}

	return 0;
@@ -70,7 +70,7 @@ int nfs_sysfs_init(void) 
void nfs_sysfs_exit(void)

{

	kobject_put(nfs_client_kobj);

	kset_unregister(nfs_client_kset);

	kset_unregister(nfs_kset);

}



static ssize_t nfs_netns_identifier_show(struct kobject *kobj,
@@ -159,7 +159,7 @@ static struct nfs_netns_client *nfs_netns_client_alloc(struct kobject *parent, 
	p = kzalloc(sizeof(*p), GFP_KERNEL);

	if (p) {

		p->net = net;

		p->kobject.kset = nfs_client_kset;

		p->kobject.kset = nfs_kset;

		if (kobject_init_and_add(&p->kobject, &nfs_netns_client_type,

					parent, "nfs_client") == 0)

			return p;