aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd/export.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-02-28 21:02:55 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-28 21:02:55 -0500
commitb6669737d3db7df79fad07180837c23dbe581db5 (patch)
tree671a9d13fe5ab00d6a3c7c5c5c466802ca96d38a /fs/nfsd/export.c
parent1cf0209c431fa7790253c532039d53b0773193aa (diff)
parentdc107402ae06286a9ed33c32daf3f35514a7cb8d (diff)
Merge branch 'for-3.9' of git://linux-nfs.org/~bfields/linux
Pull nfsd changes from J Bruce Fields: "Miscellaneous bugfixes, plus: - An overhaul of the DRC cache by Jeff Layton. The main effect is just to make it larger. This decreases the chances of intermittent errors especially in the UDP case. But we'll need to watch for any reports of performance regressions. - Containerized nfsd: with some limitations, we now support per-container nfs-service, thanks to extensive work from Stanislav Kinsbursky over the last year." Some notes about conflicts, since there were *two* non-data semantic conflicts here: - idr_remove_all() had been added by a memory leak fix, but has since become deprecated since idr_destroy() does it for us now. - xs_local_connect() had been added by this branch to make AF_LOCAL connections be synchronous, but in the meantime Trond had changed the calling convention in order to avoid a RCU dereference. There were a couple of more obvious actual source-level conflicts due to the hlist traversal changes and one just due to code changes next to each other, but those were trivial. * 'for-3.9' of git://linux-nfs.org/~bfields/linux: (49 commits) SUNRPC: make AF_LOCAL connect synchronous nfsd: fix compiler warning about ambiguous types in nfsd_cache_csum svcrpc: fix rpc server shutdown races svcrpc: make svc_age_temp_xprts enqueue under sv_lock lockd: nlmclnt_reclaim(): avoid stack overflow nfsd: enable NFSv4 state in containers nfsd: disable usermode helper client tracker in container nfsd: use proper net while reading "exports" file nfsd: containerize NFSd filesystem nfsd: fix comments on nfsd_cache_lookup SUNRPC: move cache_detail->cache_request callback call to cache_read() SUNRPC: remove "cache_request" argument in sunrpc_cache_pipe_upcall() function SUNRPC: rework cache upcall logic SUNRPC: introduce cache_detail->cache_request callback NFS: simplify and clean cache library NFS: use SUNRPC cache creation and destruction helper for DNS cache nfsd4: free_stid can be static nfsd: keep a checksum of the first 256 bytes of request sunrpc: trim off trailing checksum before returning decrypted or integrity authenticated buffer sunrpc: fix comment in struct xdr_buf definition ...
Diffstat (limited to 'fs/nfsd/export.c')
-rw-r--r--fs/nfsd/export.c16
1 files changed, 4 insertions, 12 deletions
diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c
index 5681c5906f08..5f38ea36e266 100644
--- a/fs/nfsd/export.c
+++ b/fs/nfsd/export.c
@@ -67,11 +67,6 @@ static void expkey_request(struct cache_detail *cd,
67 (*bpp)[-1] = '\n'; 67 (*bpp)[-1] = '\n';
68} 68}
69 69
70static int expkey_upcall(struct cache_detail *cd, struct cache_head *h)
71{
72 return sunrpc_cache_pipe_upcall(cd, h, expkey_request);
73}
74
75static struct svc_expkey *svc_expkey_update(struct cache_detail *cd, struct svc_expkey *new, 70static struct svc_expkey *svc_expkey_update(struct cache_detail *cd, struct svc_expkey *new,
76 struct svc_expkey *old); 71 struct svc_expkey *old);
77static struct svc_expkey *svc_expkey_lookup(struct cache_detail *cd, struct svc_expkey *); 72static struct svc_expkey *svc_expkey_lookup(struct cache_detail *cd, struct svc_expkey *);
@@ -245,7 +240,7 @@ static struct cache_detail svc_expkey_cache_template = {
245 .hash_size = EXPKEY_HASHMAX, 240 .hash_size = EXPKEY_HASHMAX,
246 .name = "nfsd.fh", 241 .name = "nfsd.fh",
247 .cache_put = expkey_put, 242 .cache_put = expkey_put,
248 .cache_upcall = expkey_upcall, 243 .cache_request = expkey_request,
249 .cache_parse = expkey_parse, 244 .cache_parse = expkey_parse,
250 .cache_show = expkey_show, 245 .cache_show = expkey_show,
251 .match = expkey_match, 246 .match = expkey_match,
@@ -315,6 +310,7 @@ static void svc_export_put(struct kref *ref)
315 path_put(&exp->ex_path); 310 path_put(&exp->ex_path);
316 auth_domain_put(exp->ex_client); 311 auth_domain_put(exp->ex_client);
317 nfsd4_fslocs_free(&exp->ex_fslocs); 312 nfsd4_fslocs_free(&exp->ex_fslocs);
313 kfree(exp->ex_uuid);
318 kfree(exp); 314 kfree(exp);
319} 315}
320 316
@@ -337,11 +333,6 @@ static void svc_export_request(struct cache_detail *cd,
337 (*bpp)[-1] = '\n'; 333 (*bpp)[-1] = '\n';
338} 334}
339 335
340static int svc_export_upcall(struct cache_detail *cd, struct cache_head *h)
341{
342 return sunrpc_cache_pipe_upcall(cd, h, svc_export_request);
343}
344
345static struct svc_export *svc_export_update(struct svc_export *new, 336static struct svc_export *svc_export_update(struct svc_export *new,
346 struct svc_export *old); 337 struct svc_export *old);
347static struct svc_export *svc_export_lookup(struct svc_export *); 338static struct svc_export *svc_export_lookup(struct svc_export *);
@@ -674,6 +665,7 @@ static void svc_export_init(struct cache_head *cnew, struct cache_head *citem)
674 new->ex_fslocs.locations = NULL; 665 new->ex_fslocs.locations = NULL;
675 new->ex_fslocs.locations_count = 0; 666 new->ex_fslocs.locations_count = 0;
676 new->ex_fslocs.migrated = 0; 667 new->ex_fslocs.migrated = 0;
668 new->ex_uuid = NULL;
677 new->cd = item->cd; 669 new->cd = item->cd;
678} 670}
679 671
@@ -715,7 +707,7 @@ static struct cache_detail svc_export_cache_template = {
715 .hash_size = EXPORT_HASHMAX, 707 .hash_size = EXPORT_HASHMAX,
716 .name = "nfsd.export", 708 .name = "nfsd.export",
717 .cache_put = svc_export_put, 709 .cache_put = svc_export_put,
718 .cache_upcall = svc_export_upcall, 710 .cache_request = svc_export_request,
719 .cache_parse = svc_export_parse, 711 .cache_parse = svc_export_parse,
720 .cache_show = svc_export_show, 712 .cache_show = svc_export_show,
721 .match = svc_export_match, 713 .match = svc_export_match,