Merge branch 'nfsd-next' of git://linux-nfs.org/~bfields/linux

Pull nfsd changes from J. Bruce Fields:
 "This has been an unusually quiet cycle--mostly bugfixes and cleanup.
  The one large piece is Stanislav's work to containerize the server's
  grace period--but that in itself is just one more step in a
  not-yet-complete project to allow fully containerized nfs service.

  There are a number of outstanding delegation, container, v4 state, and
  gss patches that aren't quite ready yet; 3.7 may be wilder."

* 'nfsd-next' of git://linux-nfs.org/~bfields/linux: (35 commits)
  NFSd: make boot_time variable per network namespace
  NFSd: make grace end flag per network namespace
  Lockd: move grace period management from lockd() to per-net functions
  LockD: pass actual network namespace to grace period management functions
  LockD: manage grace list per network namespace
  SUNRPC: service request network namespace helper introduced
  NFSd: make nfsd4_manager allocated per network namespace context.
  LockD: make lockd manager allocated per network namespace
  LockD: manage grace period per network namespace
  Lockd: add more debug to host shutdown functions
  Lockd: host complaining function introduced
  LockD: manage used host count per networks namespace
  LockD: manage garbage collection timeout per networks namespace
  LockD: make garbage collector network namespace aware.
  LockD: mark host per network namespace on garbage collect
  nfsd4: fix missing fault_inject.h include
  locks: move lease-specific code out of locks_delete_lock
  locks: prevent side-effects of locks_release_private before file_lock is initialized
  NFSd: set nfsd_serv to NULL after service destruction
  NFSd: introduce nfsd_destroy() helper
  ...

1 files changed, 9 insertions, 6 deletions

diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c
index d27aab11f324..de8f2caa2235 100644
--- a/fs/lockd/svcproc.c
+++ b/fs/lockd/svcproc.c
@@ -11,6 +11,7 @@
 #include <linux/time.h>
 #include <linux/lockd/lockd.h>
 #include <linux/lockd/share.h>
+#include <linux/sunrpc/svc_xprt.h>
 
 #define NLMDBG_FACILITY         NLMDBG_CLIENT
 
@@ -175,13 +176,14 @@ nlmsvc_proc_cancel(struct svc_rqst *rqstp, struct nlm_args *argp,
 {
         struct nlm_host *host;
         struct nlm_file *file;
+        struct net *net = SVC_NET(rqstp);
 
         dprintk("lockd: CANCEL        called\n");
 
         resp->cookie = argp->cookie;
 
         /* Don't accept requests during grace period */
-        if (locks_in_grace()) {
+        if (locks_in_grace(net)) {
                 resp->status = nlm_lck_denied_grace_period;
                 return rpc_success;
         }
@@ -191,7 +193,7 @@ nlmsvc_proc_cancel(struct svc_rqst *rqstp, struct nlm_args *argp,
                 return resp->status == nlm_drop_reply ? rpc_drop_reply :rpc_success;
 
         /* Try to cancel request. */
-        resp->status = cast_status(nlmsvc_cancel_blocked(file, &argp->lock));
+        resp->status = cast_status(nlmsvc_cancel_blocked(net, file, &argp->lock));
 
         dprintk("lockd: CANCEL        status %d\n", ntohl(resp->status));
         nlmsvc_release_host(host);
@@ -208,13 +210,14 @@ nlmsvc_proc_unlock(struct svc_rqst *rqstp, struct nlm_args *argp,
 {
         struct nlm_host *host;
         struct nlm_file *file;
+        struct net *net = SVC_NET(rqstp);
 
         dprintk("lockd: UNLOCK        called\n");
 
         resp->cookie = argp->cookie;
 
         /* Don't accept new lock requests during grace period */
-        if (locks_in_grace()) {
+        if (locks_in_grace(net)) {
                 resp->status = nlm_lck_denied_grace_period;
                 return rpc_success;
         }
@@ -224,7 +227,7 @@ nlmsvc_proc_unlock(struct svc_rqst *rqstp, struct nlm_args *argp,
                 return resp->status == nlm_drop_reply ? rpc_drop_reply :rpc_success;
 
         /* Now try to remove the lock */
-        resp->status = cast_status(nlmsvc_unlock(file, &argp->lock));
+        resp->status = cast_status(nlmsvc_unlock(net, file, &argp->lock));
 
         dprintk("lockd: UNLOCK        status %d\n", ntohl(resp->status));
         nlmsvc_release_host(host);
@@ -361,7 +364,7 @@ nlmsvc_proc_share(struct svc_rqst *rqstp, struct nlm_args *argp,
         resp->cookie = argp->cookie;
 
         /* Don't accept new lock requests during grace period */
-        if (locks_in_grace() && !argp->reclaim) {
+        if (locks_in_grace(SVC_NET(rqstp)) && !argp->reclaim) {
                 resp->status = nlm_lck_denied_grace_period;
                 return rpc_success;
         }
@@ -394,7 +397,7 @@ nlmsvc_proc_unshare(struct svc_rqst *rqstp, struct nlm_args *argp,
         resp->cookie = argp->cookie;
 
         /* Don't accept requests during grace period */
-        if (locks_in_grace()) {
+        if (locks_in_grace(SVC_NET(rqstp))) {
                 resp->status = nlm_lck_denied_grace_period;
                 return rpc_success;
         }