aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd/nfs4recover.c
diff options
context:
space:
mode:
authorStanislav Kinsbursky <skinsbursky@parallels.com>2012-11-14 10:21:10 -0500
committerJ. Bruce Fields <bfields@redhat.com>2012-11-15 07:40:42 -0500
commitc212cecfa21b3d30cd5cc2389754a46973ad9027 (patch)
treece0e190694a98dd8f526b00d9b60aa8861faebbc /fs/nfsd/nfs4recover.c
parent7f2210fa6b791c290e36d8b3c8af7aaf22b2aaf0 (diff)
nfsd: make nfs4_client network namespace dependent
And use it's net where possible. Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfs4recover.c')
-rw-r--r--fs/nfsd/nfs4recover.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c
index b03b6aa7a6a0..9881bcad264b 100644
--- a/fs/nfsd/nfs4recover.c
+++ b/fs/nfsd/nfs4recover.c
@@ -859,8 +859,7 @@ nfsd4_cld_create(struct nfs4_client *clp)
859{ 859{
860 int ret; 860 int ret;
861 struct cld_upcall *cup; 861 struct cld_upcall *cup;
862 /* FIXME: determine net from clp */ 862 struct nfsd_net *nn = net_generic(clp->net, nfsd_net_id);
863 struct nfsd_net *nn = net_generic(&init_net, nfsd_net_id);
864 struct cld_net *cn = nn->cld_net; 863 struct cld_net *cn = nn->cld_net;
865 864
866 /* Don't upcall if it's already stored */ 865 /* Don't upcall if it's already stored */
@@ -897,8 +896,7 @@ nfsd4_cld_remove(struct nfs4_client *clp)
897{ 896{
898 int ret; 897 int ret;
899 struct cld_upcall *cup; 898 struct cld_upcall *cup;
900 /* FIXME: determine net from clp */ 899 struct nfsd_net *nn = net_generic(clp->net, nfsd_net_id);
901 struct nfsd_net *nn = net_generic(&init_net, nfsd_net_id);
902 struct cld_net *cn = nn->cld_net; 900 struct cld_net *cn = nn->cld_net;
903 901
904 /* Don't upcall if it's already removed */ 902 /* Don't upcall if it's already removed */
@@ -935,8 +933,7 @@ nfsd4_cld_check(struct nfs4_client *clp)
935{ 933{
936 int ret; 934 int ret;
937 struct cld_upcall *cup; 935 struct cld_upcall *cup;
938 /* FIXME: determine net from clp */ 936 struct nfsd_net *nn = net_generic(clp->net, nfsd_net_id);
939 struct nfsd_net *nn = net_generic(&init_net, nfsd_net_id);
940 struct cld_net *cn = nn->cld_net; 937 struct cld_net *cn = nn->cld_net;
941 938
942 /* Don't upcall if one was already stored during this grace pd */ 939 /* Don't upcall if one was already stored during this grace pd */