6 files changed, 12 insertions, 10 deletions

diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index cbef57a16ffb..0f583cb16ddb 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -898,7 +898,8 @@ int nfs_init_directcache(void)
 {
         nfs_direct_cachep = kmem_cache_create("nfs_direct_cache",
                                                 sizeof(struct nfs_direct_req),
-                                                0, SLAB_RECLAIM_ACCOUNT,
+                                                0, (SLAB_RECLAIM_ACCOUNT|
+                                                        SLAB_MEM_SPREAD),
                                                 NULL, NULL);
         if (nfs_direct_cachep == NULL)
                 return -ENOMEM;
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 60aac58270a8..2f7656b911b6 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -107,7 +107,7 @@ static struct rpc_version *	nfs_version[] = {
 static struct rpc_program       nfs_program = {
         .name                   = "nfs",
         .number                 = NFS_PROGRAM,
-        .nrvers                 = sizeof(nfs_version) / sizeof(nfs_version[0]),
+        .nrvers                 = ARRAY_SIZE(nfs_version),
         .version                = nfs_version,
         .stats                  = &nfs_rpcstat,
         .pipe_dir_name          = "/nfs",
@@ -122,7 +122,7 @@ static struct rpc_version *	nfsacl_version[] = {
 struct rpc_program              nfsacl_program = {
         .name =                 "nfsacl",
         .number =               NFS_ACL_PROGRAM,
-        .nrvers =               sizeof(nfsacl_version) / sizeof(nfsacl_version[0]),
+        .nrvers =               ARRAY_SIZE(nfsacl_version),
         .version =              nfsacl_version,
         .stats =                &nfsacl_rpcstat,
 };
@@ -1786,7 +1786,7 @@ static struct super_block *nfs_get_sb(struct file_system_type *fs_type,
 
         s->s_flags = flags;
 
-        error = nfs_fill_super(s, data, flags & MS_VERBOSE ? 1 : 0);
+        error = nfs_fill_super(s, data, flags & MS_SILENT ? 1 : 0);
         if (error) {
                 up_write(&s->s_umount);
                 deactivate_super(s);
@@ -2107,7 +2107,7 @@ static struct super_block *nfs4_get_sb(struct file_system_type *fs_type,
 
         s->s_flags = flags;
 
-        error = nfs4_fill_super(s, data, flags & MS_VERBOSE ? 1 : 0);
+        error = nfs4_fill_super(s, data, flags & MS_SILENT ? 1 : 0);
         if (error) {
                 up_write(&s->s_umount);
                 deactivate_super(s);
@@ -2276,7 +2276,8 @@ static int nfs_init_inodecache(void)
 {
         nfs_inode_cachep = kmem_cache_create("nfs_inode_cache",
                                              sizeof(struct nfs_inode),
-                                             0, SLAB_RECLAIM_ACCOUNT,
+                                             0, (SLAB_RECLAIM_ACCOUNT|
+                                                SLAB_MEM_SPREAD),
                                              init_once, NULL);
         if (nfs_inode_cachep == NULL)
                 return -ENOMEM;
diff --git a/fs/nfs/mount_clnt.c b/fs/nfs/mount_clnt.c
index c44d87bdddb3..445abb4d4214 100644
--- a/fs/nfs/mount_clnt.c
+++ b/fs/nfs/mount_clnt.c
@@ -185,7 +185,7 @@ static struct rpc_stat		mnt_stats;
 static struct rpc_program       mnt_program = {
         .name           = "mount",
         .number         = NFS_MNT_PROGRAM,
-        .nrvers         = sizeof(mnt_version)/sizeof(mnt_version[0]),
+        .nrvers         = ARRAY_SIZE(mnt_version),
         .version        = mnt_version,
         .stats          = &mnt_stats,
 };
diff --git a/fs/nfs/nfs2xdr.c b/fs/nfs/nfs2xdr.c
index 8cdc792ff3c7..f0015fa876e1 100644
--- a/fs/nfs/nfs2xdr.c
+++ b/fs/nfs/nfs2xdr.c
@@ -706,6 +706,6 @@ struct rpc_procinfo	nfs_procedures[] = {
 
 struct rpc_version              nfs_version2 = {
         .number                 = 2,
-        .nrprocs                = sizeof(nfs_procedures)/sizeof(nfs_procedures[0]),
+        .nrprocs                = ARRAY_SIZE(nfs_procedures),
         .procs                  = nfs_procedures
 };
diff --git a/fs/nfs/nfs3xdr.c b/fs/nfs/nfs3xdr.c
index 2d8701a230f0..ec233619687e 100644
--- a/fs/nfs/nfs3xdr.c
+++ b/fs/nfs/nfs3xdr.c
@@ -1140,7 +1140,7 @@ struct rpc_procinfo	nfs3_procedures[] = {
 
 struct rpc_version              nfs_version3 = {
         .number                 = 3,
-        .nrprocs                = sizeof(nfs3_procedures)/sizeof(nfs3_procedures[0]),
+        .nrprocs                = ARRAY_SIZE(nfs3_procedures),
         .procs                  = nfs3_procedures
 };
 
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index b95675349ba3..7c5d70efe720 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -4386,7 +4386,7 @@ struct rpc_procinfo	nfs4_procedures[] = {
 
 struct rpc_version              nfs_version4 = {
         .number                 = 4,
-        .nrprocs                = sizeof(nfs4_procedures)/sizeof(nfs4_procedures[0]),
+        .nrprocs                = ARRAY_SIZE(nfs4_procedures),
         .procs                  = nfs4_procedures
 };