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
  ...

1 files changed, 60 insertions, 21 deletions

diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index 2db7021b01ae..13a21c8fca49 100644
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -10,7 +10,7 @@
 
 #include <linux/sunrpc/svcsock.h>
 #include <linux/lockd/lockd.h>
-#include <linux/sunrpc/clnt.h>
+#include <linux/sunrpc/addr.h>
 #include <linux/sunrpc/gss_api.h>
 #include <linux/sunrpc/gss_krb5_enctypes.h>
 #include <linux/sunrpc/rpc_pipe_fs.h>
@@ -125,11 +125,11 @@ static const struct file_operations transaction_ops = {
         .llseek         = default_llseek,
 };
 
-static int exports_open(struct inode *inode, struct file *file)
+static int exports_net_open(struct net *net, struct file *file)
 {
         int err;
         struct seq_file *seq;
-        struct nfsd_net *nn = net_generic(&init_net, nfsd_net_id);
+        struct nfsd_net *nn = net_generic(net, nfsd_net_id);
 
         err = seq_open(file, &nfs_exports_op);
         if (err)
@@ -140,8 +140,26 @@ static int exports_open(struct inode *inode, struct file *file)
         return 0;
 }
 
-static const struct file_operations exports_operations = {
-        .open           = exports_open,
+static int exports_proc_open(struct inode *inode, struct file *file)
+{
+        return exports_net_open(current->nsproxy->net_ns, file);
+}
+
+static const struct file_operations exports_proc_operations = {
+        .open           = exports_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = seq_release,
+        .owner          = THIS_MODULE,
+};
+
+static int exports_nfsd_open(struct inode *inode, struct file *file)
+{
+        return exports_net_open(inode->i_sb->s_fs_info, file);
+}
+
+static const struct file_operations exports_nfsd_operations = {
+        .open           = exports_nfsd_open,
         .read           = seq_read,
         .llseek         = seq_lseek,
         .release        = seq_release,
@@ -220,6 +238,7 @@ static ssize_t write_unlock_ip(struct file *file, char *buf, size_t size)
         struct sockaddr *sap = (struct sockaddr *)&address;
         size_t salen = sizeof(address);
         char *fo_path;
+        struct net *net = file->f_dentry->d_sb->s_fs_info;
 
         /* sanity check */
         if (size == 0)
@@ -232,7 +251,7 @@ static ssize_t write_unlock_ip(struct file *file, char *buf, size_t size)
         if (qword_get(&buf, fo_path, size) < 0)
                 return -EINVAL;
 
-        if (rpc_pton(&init_net, fo_path, size, sap, salen) == 0)
+        if (rpc_pton(net, fo_path, size, sap, salen) == 0)
                 return -EINVAL;
 
         return nlmsvc_unlock_all_by_ip(sap);
@@ -317,6 +336,7 @@ static ssize_t write_filehandle(struct file *file, char *buf, size_t size)
         int len;
         struct auth_domain *dom;
         struct knfsd_fh fh;
+        struct net *net = file->f_dentry->d_sb->s_fs_info;
 
         if (size == 0)
                 return -EINVAL;
@@ -352,7 +372,7 @@ static ssize_t write_filehandle(struct file *file, char *buf, size_t size)
         if (!dom)
                 return -ENOMEM;
 
-        len = exp_rootfh(&init_net, dom, path, &fh,  maxsize);
+        len = exp_rootfh(net, dom, path, &fh,  maxsize);
         auth_domain_put(dom);
         if (len)
                 return len;
@@ -396,7 +416,7 @@ static ssize_t write_threads(struct file *file, char *buf, size_t size)
 {
         char *mesg = buf;
         int rv;
-        struct net *net = &init_net;
+        struct net *net = file->f_dentry->d_sb->s_fs_info;
 
         if (size > 0) {
                 int newthreads;
@@ -447,7 +467,7 @@ static ssize_t write_pool_threads(struct file *file, char *buf, size_t size)
         int len;
         int npools;
         int *nthreads;
-        struct net *net = &init_net;
+        struct net *net = file->f_dentry->d_sb->s_fs_info;
 
         mutex_lock(&nfsd_mutex);
         npools = nfsd_nrpools(net);
@@ -510,7 +530,7 @@ static ssize_t __write_versions(struct file *file, char *buf, size_t size)
         unsigned minor;
         ssize_t tlen = 0;
         char *sep;
-        struct net *net = &init_net;
+        struct net *net = file->f_dentry->d_sb->s_fs_info;
         struct nfsd_net *nn = net_generic(net, nfsd_net_id);
 
         if (size>0) {
@@ -534,7 +554,7 @@ static ssize_t __write_versions(struct file *file, char *buf, size_t size)
                         else
                                 num = simple_strtol(vers, &minorp, 0);
                         if (*minorp == '.') {
-                                if (num < 4)
+                                if (num != 4)
                                         return -EINVAL;
                                 minor = simple_strtoul(minorp+1, NULL, 0);
                                 if (minor == 0)
@@ -792,7 +812,7 @@ static ssize_t __write_ports(struct file *file, char *buf, size_t size,
 static ssize_t write_ports(struct file *file, char *buf, size_t size)
 {
         ssize_t rv;
-        struct net *net = &init_net;
+        struct net *net = file->f_dentry->d_sb->s_fs_info;
 
         mutex_lock(&nfsd_mutex);
         rv = __write_ports(file, buf, size, net);
@@ -827,7 +847,7 @@ int nfsd_max_blksize;
 static ssize_t write_maxblksize(struct file *file, char *buf, size_t size)
 {
         char *mesg = buf;
-        struct net *net = &init_net;
+        struct net *net = file->f_dentry->d_sb->s_fs_info;
         struct nfsd_net *nn = net_generic(net, nfsd_net_id);
 
         if (size > 0) {
@@ -923,7 +943,8 @@ static ssize_t nfsd4_write_time(struct file *file, char *buf, size_t size,
  */
 static ssize_t write_leasetime(struct file *file, char *buf, size_t size)
 {
-        struct nfsd_net *nn = net_generic(&init_net, nfsd_net_id);
+        struct net *net = file->f_dentry->d_sb->s_fs_info;
+        struct nfsd_net *nn = net_generic(net, nfsd_net_id);
         return nfsd4_write_time(file, buf, size, &nn->nfsd4_lease, nn);
 }
 
@@ -939,7 +960,8 @@ static ssize_t write_leasetime(struct file *file, char *buf, size_t size)
  */
 static ssize_t write_gracetime(struct file *file, char *buf, size_t size)
 {
-        struct nfsd_net *nn = net_generic(&init_net, nfsd_net_id);
+        struct net *net = file->f_dentry->d_sb->s_fs_info;
+        struct nfsd_net *nn = net_generic(net, nfsd_net_id);
         return nfsd4_write_time(file, buf, size, &nn->nfsd4_grace, nn);
 }
 
@@ -995,7 +1017,8 @@ static ssize_t __write_recoverydir(struct file *file, char *buf, size_t size,
 static ssize_t write_recoverydir(struct file *file, char *buf, size_t size)
 {
         ssize_t rv;
-        struct nfsd_net *nn = net_generic(&init_net, nfsd_net_id);
+        struct net *net = file->f_dentry->d_sb->s_fs_info;
+        struct nfsd_net *nn = net_generic(net, nfsd_net_id);
 
         mutex_lock(&nfsd_mutex);
         rv = __write_recoverydir(file, buf, size, nn);
@@ -1013,7 +1036,7 @@ static ssize_t write_recoverydir(struct file *file, char *buf, size_t size)
 static int nfsd_fill_super(struct super_block * sb, void * data, int silent)
 {
         static struct tree_descr nfsd_files[] = {
-                [NFSD_List] = {"exports", &exports_operations, S_IRUGO},
+                [NFSD_List] = {"exports", &exports_nfsd_operations, S_IRUGO},
                 [NFSD_Export_features] = {"export_features",
                                         &export_features_operations, S_IRUGO},
                 [NFSD_FO_UnlockIP] = {"unlock_ip",
@@ -1037,20 +1060,35 @@ static int nfsd_fill_super(struct super_block * sb, void * data, int silent)
 #endif
                 /* last one */ {""}
         };
-        return simple_fill_super(sb, 0x6e667364, nfsd_files);
+        struct net *net = data;
+        int ret;
+
+        ret = simple_fill_super(sb, 0x6e667364, nfsd_files);
+        if (ret)
+                return ret;
+        sb->s_fs_info = get_net(net);
+        return 0;
 }
 
 static struct dentry *nfsd_mount(struct file_system_type *fs_type,
         int flags, const char *dev_name, void *data)
 {
-        return mount_single(fs_type, flags, data, nfsd_fill_super);
+        return mount_ns(fs_type, flags, current->nsproxy->net_ns, nfsd_fill_super);
+}
+
+static void nfsd_umount(struct super_block *sb)
+{
+        struct net *net = sb->s_fs_info;
+
+        kill_litter_super(sb);
+        put_net(net);
 }
 
 static struct file_system_type nfsd_fs_type = {
         .owner          = THIS_MODULE,
         .name           = "nfsd",
         .mount          = nfsd_mount,
-        .kill_sb        = kill_litter_super,
+        .kill_sb        = nfsd_umount,
 };
 
 #ifdef CONFIG_PROC_FS
@@ -1061,7 +1099,8 @@ static int create_proc_exports_entry(void)
         entry = proc_mkdir("fs/nfs", NULL);
         if (!entry)
                 return -ENOMEM;
-        entry = proc_create("exports", 0, entry, &exports_operations);
+        entry = proc_create("exports", 0, entry,
+                                 &exports_proc_operations);
         if (!entry)
                 return -ENOMEM;
         return 0;