Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>

1 files changed, 14 insertions, 19 deletions

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 8219c02145a7..d4b713e5affb 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -476,7 +476,7 @@ cifs_get_sb(struct file_system_type *fs_type,
 
         sb->s_flags = flags;
 
-        rc = cifs_read_super(sb, data, dev_name, flags & MS_VERBOSE ? 1 : 0);
+        rc = cifs_read_super(sb, data, dev_name, flags & MS_SILENT ? 1 : 0);
         if (rc) {
                 up_write(&sb->s_umount);
                 deactivate_super(sb);
@@ -580,7 +580,7 @@ struct inode_operations cifs_symlink_inode_ops = {
 #endif 
 };
 
-struct file_operations cifs_file_ops = {
+const struct file_operations cifs_file_ops = {
         .read = do_sync_read,
         .write = do_sync_write,
         .readv = generic_file_readv,
@@ -604,7 +604,7 @@ struct file_operations cifs_file_ops = {
 #endif /* CONFIG_CIFS_EXPERIMENTAL */
 };
 
-struct file_operations cifs_file_direct_ops = {
+const struct file_operations cifs_file_direct_ops = {
         /* no mmap, no aio, no readv - 
            BB reevaluate whether they can be done with directio, no cache */
         .read = cifs_user_read,
@@ -623,7 +623,7 @@ struct file_operations cifs_file_direct_ops = {
         .dir_notify = cifs_dir_notify,
 #endif /* CONFIG_CIFS_EXPERIMENTAL */
 };
-struct file_operations cifs_file_nobrl_ops = {
+const struct file_operations cifs_file_nobrl_ops = {
         .read = do_sync_read,
         .write = do_sync_write,
         .readv = generic_file_readv,
@@ -646,7 +646,7 @@ struct file_operations cifs_file_nobrl_ops = {
 #endif /* CONFIG_CIFS_EXPERIMENTAL */
 };
 
-struct file_operations cifs_file_direct_nobrl_ops = {
+const struct file_operations cifs_file_direct_nobrl_ops = {
         /* no mmap, no aio, no readv - 
            BB reevaluate whether they can be done with directio, no cache */
         .read = cifs_user_read,
@@ -665,7 +665,7 @@ struct file_operations cifs_file_direct_nobrl_ops = {
 #endif /* CONFIG_CIFS_EXPERIMENTAL */
 };
 
-struct file_operations cifs_dir_ops = {
+const struct file_operations cifs_dir_ops = {
         .readdir = cifs_readdir,
         .release = cifs_closedir,
         .read    = generic_read_dir,
@@ -692,7 +692,8 @@ cifs_init_inodecache(void)
 {
         cifs_inode_cachep = kmem_cache_create("cifs_inode_cache",
                                               sizeof (struct cifsInodeInfo),
-                                              0, SLAB_RECLAIM_ACCOUNT,
+                                              0, (SLAB_RECLAIM_ACCOUNT|
+                                                SLAB_MEM_SPREAD),
                                               cifs_init_once, NULL);
         if (cifs_inode_cachep == NULL)
                 return -ENOMEM;
@@ -734,10 +735,8 @@ cifs_init_request_bufs(void)
                 cERROR(1,("cifs_min_rcv set to maximum (64)"));
         }
 
-        cifs_req_poolp = mempool_create(cifs_min_rcv,
-                                        mempool_alloc_slab,
-                                        mempool_free_slab,
-                                        cifs_req_cachep);
+        cifs_req_poolp = mempool_create_slab_pool(cifs_min_rcv,
+                                                  cifs_req_cachep);
 
         if(cifs_req_poolp == NULL) {
                 kmem_cache_destroy(cifs_req_cachep);
@@ -767,10 +766,8 @@ cifs_init_request_bufs(void)
                 cFYI(1,("cifs_min_small set to maximum (256)"));
         }
 
-        cifs_sm_req_poolp = mempool_create(cifs_min_small,
-                                mempool_alloc_slab,
-                                mempool_free_slab,
-                                cifs_sm_req_cachep);
+        cifs_sm_req_poolp = mempool_create_slab_pool(cifs_min_small,
+                                                     cifs_sm_req_cachep);
 
         if(cifs_sm_req_poolp == NULL) {
                 mempool_destroy(cifs_req_poolp);
@@ -804,10 +801,8 @@ cifs_init_mids(void)
         if (cifs_mid_cachep == NULL)
                 return -ENOMEM;
 
-        cifs_mid_poolp = mempool_create(3 /* a reasonable min simultan opers */,
-                                        mempool_alloc_slab,
-                                        mempool_free_slab,
-                                        cifs_mid_cachep);
+        /* 3 is a reasonable minimum number of simultaneous operations */
+        cifs_mid_poolp = mempool_create_slab_pool(3, cifs_mid_cachep);
         if(cifs_mid_poolp == NULL) {
                 kmem_cache_destroy(cifs_mid_cachep);
                 return -ENOMEM;