Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02a21de9 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'pernet-convert-part7.1' 



Kirill Tkhai says:

====================
Converting pernet_operations (part #7.1)

this is a resending of the 4 patches from path #7.

Anna kindly reviewed them and suggested to take the patches
through net tree, since there is pernet_operations::async only
in net-next.git.

There is Anna's acks on every header, the rest of patch
has no changes.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1c976a8c dbf7bb44

fs/nfs/blocklayout/rpc_pipefs.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -261,6 +261,7 @@ static void nfs4blocklayout_net_exit(struct net *net) 
static struct pernet_operations nfs4blocklayout_net_ops = {

static struct pernet_operations nfs4blocklayout_net_ops = {

	.init = nfs4blocklayout_net_init,

	.init = nfs4blocklayout_net_init,

	.exit = nfs4blocklayout_net_exit,

	.exit = nfs4blocklayout_net_exit,

	.async = true,

};

};





int __init bl_init_pipefs(void)

int __init bl_init_pipefs(void)

fs/nfs/dns_resolve.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -410,6 +410,7 @@ static void nfs4_dns_net_exit(struct net *net) 
static struct pernet_operations nfs4_dns_resolver_ops = {

static struct pernet_operations nfs4_dns_resolver_ops = {

	.init = nfs4_dns_net_init,

	.init = nfs4_dns_net_init,

	.exit = nfs4_dns_net_exit,

	.exit = nfs4_dns_net_exit,

	.async = true,

};

};





static int rpc_pipefs_event(struct notifier_block *nb, unsigned long event,

static int rpc_pipefs_event(struct notifier_block *nb, unsigned long event,

net/sunrpc/auth_gss/auth_gss.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -2063,6 +2063,7 @@ static __net_exit void rpcsec_gss_exit_net(struct net *net) 
static struct pernet_operations rpcsec_gss_net_ops = {

static struct pernet_operations rpcsec_gss_net_ops = {

	.init = rpcsec_gss_init_net,

	.init = rpcsec_gss_init_net,

	.exit = rpcsec_gss_exit_net,

	.exit = rpcsec_gss_exit_net,

	.async = true,

};

};





/*

/*

net/sunrpc/sunrpc_syms.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -79,6 +79,7 @@ static struct pernet_operations sunrpc_net_ops = { 
	.exit = sunrpc_exit_net,

	.exit = sunrpc_exit_net,

	.id = &sunrpc_net_id,

	.id = &sunrpc_net_id,

	.size = sizeof(struct sunrpc_net),

	.size = sizeof(struct sunrpc_net),

	.async = true,

};

};





static int __init

static int __init