8 files changed, 46 insertions, 57 deletions

diff --git a/fs/minix/bitmap.c b/fs/minix/bitmap.c
index dc6a4e4abcdc..4a6abc49418e 100644
--- a/fs/minix/bitmap.c
+++ b/fs/minix/bitmap.c
@@ -56,7 +56,7 @@ void minix_free_block(struct inode * inode, int block)
         unsigned int bit,zone;
 
         if (block < sbi->s_firstdatazone || block >= sbi->s_nzones) {
-                printk("trying to free block not in datazone\n");
+                printk("Trying to free block not in datazone\n");
                 return;
         }
         zone = block - sbi->s_firstdatazone + 1;
@@ -124,7 +124,7 @@ minix_V1_raw_inode(struct super_block *sb, ino_t ino, struct buffer_head **bh)
                  ino / MINIX_INODES_PER_BLOCK;
         *bh = sb_bread(sb, block);
         if (!*bh) {
-                printk("unable to read i-node block\n");
+                printk("Unable to read inode block\n");
                 return NULL;
         }
         p = (void *)(*bh)->b_data;
@@ -149,7 +149,7 @@ minix_V2_raw_inode(struct super_block *sb, ino_t ino, struct buffer_head **bh)
                  ino / MINIX2_INODES_PER_BLOCK;
         *bh = sb_bread(sb, block);
         if (!*bh) {
-                printk("unable to read i-node block\n");
+                printk("Unable to read inode block\n");
                 return NULL;
         }
         p = (void *)(*bh)->b_data;
@@ -204,7 +204,7 @@ void minix_free_inode(struct inode * inode)
         bh = sbi->s_imap[ino >> 13];
         lock_kernel();
         if (!minix_test_and_clear_bit(ino & 8191, bh->b_data))
-                printk("minix_free_inode: bit %lu already cleared.\n", ino);
+                printk("minix_free_inode: bit %lu already cleared\n", ino);
         unlock_kernel();
         mark_buffer_dirty(bh);
  out:
@@ -238,7 +238,7 @@ struct inode * minix_new_inode(const struct inode * dir, int * error)
                 return NULL;
         }
         if (minix_test_and_set_bit(j,bh->b_data)) {     /* shouldn't happen */
-                printk("new_inode: bit already set");
+                printk("new_inode: bit already set\n");
                 unlock_kernel();
                 iput(inode);
                 return NULL;
diff --git a/fs/minix/dir.c b/fs/minix/dir.c
index 732502aabc05..69224d1fe043 100644
--- a/fs/minix/dir.c
+++ b/fs/minix/dir.c
@@ -14,7 +14,7 @@ typedef struct minix_dir_entry minix_dirent;
 
 static int minix_readdir(struct file *, void *, filldir_t);
 
-struct file_operations minix_dir_operations = {
+const struct file_operations minix_dir_operations = {
         .read           = generic_read_dir,
         .readdir        = minix_readdir,
         .fsync          = minix_sync_file,
diff --git a/fs/minix/file.c b/fs/minix/file.c
index f1d77acb3f01..420b32882a10 100644
--- a/fs/minix/file.c
+++ b/fs/minix/file.c
@@ -15,7 +15,7 @@
  */
 int minix_sync_file(struct file *, struct dentry *, int);
 
-struct file_operations minix_file_operations = {
+const struct file_operations minix_file_operations = {
         .llseek         = generic_file_llseek,
         .read           = generic_file_read,
         .write          = generic_file_write,
diff --git a/fs/minix/inode.c b/fs/minix/inode.c
index 790cc0d0e970..2dcccf1d1b7f 100644
--- a/fs/minix/inode.c
+++ b/fs/minix/inode.c
@@ -80,7 +80,8 @@ static int init_inodecache(void)
 {
         minix_inode_cachep = kmem_cache_create("minix_inode_cache",
                                              sizeof(struct minix_inode_info),
-                                             0, SLAB_RECLAIM_ACCOUNT,
+                                             0, (SLAB_RECLAIM_ACCOUNT|
+                                                SLAB_MEM_SPREAD),
                                              init_once, NULL);
         if (minix_inode_cachep == NULL)
                 return -ENOMEM;
@@ -126,11 +127,11 @@ static int minix_remount (struct super_block * sb, int * flags, char * data)
                 mark_buffer_dirty(sbi->s_sbh);
 
                 if (!(sbi->s_mount_state & MINIX_VALID_FS))
-                        printk ("MINIX-fs warning: remounting unchecked fs, "
-                                "running fsck is recommended.\n");
+                        printk("MINIX-fs warning: remounting unchecked fs, "
+                                "running fsck is recommended\n");
                 else if ((sbi->s_mount_state & MINIX_ERROR_FS))
-                        printk ("MINIX-fs warning: remounting fs with errors, "
-                                "running fsck is recommended.\n");
+                        printk("MINIX-fs warning: remounting fs with errors, "
+                                "running fsck is recommended\n");
         }
         return 0;
 }
@@ -244,11 +245,11 @@ static int minix_fill_super(struct super_block *s, void *data, int silent)
                 mark_buffer_dirty(bh);
         }
         if (!(sbi->s_mount_state & MINIX_VALID_FS))
-                printk ("MINIX-fs: mounting unchecked file system, "
-                        "running fsck is recommended.\n");
+                printk("MINIX-fs: mounting unchecked file system, "
+                        "running fsck is recommended\n");
         else if (sbi->s_mount_state & MINIX_ERROR_FS)
-                printk ("MINIX-fs: mounting file system with errors, "
-                        "running fsck is recommended.\n");
+                printk("MINIX-fs: mounting file system with errors, "
+                        "running fsck is recommended\n");
         return 0;
 
 out_iput:
@@ -272,19 +273,19 @@ out_no_bitmap:
 
 out_no_map:
         if (!silent)
-                printk ("MINIX-fs: can't allocate map\n");
+                printk("MINIX-fs: can't allocate map\n");
         goto out_release;
 
 out_no_fs:
         if (!silent)
-                printk("VFS: Can't find a Minix or Minix V2 filesystem on device "
-                       "%s.\n", s->s_id);
+                printk("VFS: Can't find a Minix or Minix V2 filesystem "
+                        "on device %s\n", s->s_id);
     out_release:
         brelse(bh);
         goto out;
 
 out_bad_hblock:
-        printk("MINIX-fs: blocksize too small for device.\n");
+        printk("MINIX-fs: blocksize too small for device\n");
         goto out;
 
 out_bad_sb:
@@ -523,7 +524,7 @@ int minix_sync_inode(struct inode * inode)
                 sync_dirty_buffer(bh);
                 if (buffer_req(bh) && !buffer_uptodate(bh))
                 {
-                        printk ("IO error syncing minix inode [%s:%08lx]\n",
+                        printk("IO error syncing minix inode [%s:%08lx]\n",
                                 inode->i_sb->s_id, inode->i_ino);
                         err = -1;
                 }
diff --git a/fs/minix/itree_v1.c b/fs/minix/itree_v1.c
index ba06aef4aca1..656b1347a25b 100644
--- a/fs/minix/itree_v1.c
+++ b/fs/minix/itree_v1.c
@@ -25,9 +25,9 @@ static int block_to_path(struct inode * inode, long block, int offsets[DEPTH])
         int n = 0;
 
         if (block < 0) {
-                printk("minix_bmap: block<0");
+                printk("minix_bmap: block<0\n");
         } else if (block >= (minix_sb(inode->i_sb)->s_max_size/BLOCK_SIZE)) {
-                printk("minix_bmap: block>big");
+                printk("minix_bmap: block>big\n");
         } else if (block < 7) {
                 offsets[n++] = block;
         } else if ((block -= 7) < 512) {
diff --git a/fs/minix/itree_v2.c b/fs/minix/itree_v2.c
index 3adc7675560f..9adcdc754e0f 100644
--- a/fs/minix/itree_v2.c
+++ b/fs/minix/itree_v2.c
@@ -25,9 +25,9 @@ static int block_to_path(struct inode * inode, long block, int offsets[DEPTH])
         int n = 0;
 
         if (block < 0) {
-                printk("minix_bmap: block<0");
+                printk("minix_bmap: block<0\n");
         } else if (block >= (minix_sb(inode->i_sb)->s_max_size/BLOCK_SIZE)) {
-                printk("minix_bmap: block>big");
+                printk("minix_bmap: block>big\n");
         } else if (block < 7) {
                 offsets[n++] = block;
         } else if ((block -= 7) < 256) {
diff --git a/fs/minix/minix.h b/fs/minix/minix.h
index e42a8bb89001..c55b77cdcc8e 100644
--- a/fs/minix/minix.h
+++ b/fs/minix/minix.h
@@ -81,8 +81,8 @@ extern int minix_sync_file(struct file *, struct dentry *, int);
 
 extern struct inode_operations minix_file_inode_operations;
 extern struct inode_operations minix_dir_inode_operations;
-extern struct file_operations minix_file_operations;
-extern struct file_operations minix_dir_operations;
+extern const struct file_operations minix_file_operations;
+extern const struct file_operations minix_dir_operations;
 extern struct dentry_operations minix_dentry_operations;
 
 static inline struct minix_sb_info *minix_sb(struct super_block *sb)
diff --git a/fs/minix/namei.c b/fs/minix/namei.c
index b25bca5bdb57..5b6a4540a05b 100644
--- a/fs/minix/namei.c
+++ b/fs/minix/namei.c
@@ -6,18 +6,6 @@
 
 #include "minix.h"
 
-static inline void inc_count(struct inode *inode)
-{
-        inode->i_nlink++;
-        mark_inode_dirty(inode);
-}
-
-static inline void dec_count(struct inode *inode)
-{
-        inode->i_nlink--;
-        mark_inode_dirty(inode);
-}
-
 static int add_nondir(struct dentry *dentry, struct inode *inode)
 {
         int err = minix_add_link(dentry, inode);
@@ -25,7 +13,7 @@ static int add_nondir(struct dentry *dentry, struct inode *inode)
                 d_instantiate(dentry, inode);
                 return 0;
         }
-        dec_count(inode);
+        inode_dec_link_count(inode);
         iput(inode);
         return err;
 }
@@ -125,7 +113,7 @@ out:
         return err;
 
 out_fail:
-        dec_count(inode);
+        inode_dec_link_count(inode);
         iput(inode);
         goto out;
 }
@@ -139,7 +127,7 @@ static int minix_link(struct dentry * old_dentry, struct inode * dir,
                 return -EMLINK;
 
         inode->i_ctime = CURRENT_TIME_SEC;
-        inc_count(inode);
+        inode_inc_link_count(inode);
         atomic_inc(&inode->i_count);
         return add_nondir(dentry, inode);
 }
@@ -152,7 +140,7 @@ static int minix_mkdir(struct inode * dir, struct dentry *dentry, int mode)
         if (dir->i_nlink >= minix_sb(dir->i_sb)->s_link_max)
                 goto out;
 
-        inc_count(dir);
+        inode_inc_link_count(dir);
 
         inode = minix_new_inode(dir, &err);
         if (!inode)
@@ -163,7 +151,7 @@ static int minix_mkdir(struct inode * dir, struct dentry *dentry, int mode)
                 inode->i_mode |= S_ISGID;
         minix_set_inode(inode, 0);
 
-        inc_count(inode);
+        inode_inc_link_count(inode);
 
         err = minix_make_empty(inode, dir);
         if (err)
@@ -178,11 +166,11 @@ out:
         return err;
 
 out_fail:
-        dec_count(inode);
-        dec_count(inode);
+        inode_dec_link_count(inode);
+        inode_dec_link_count(inode);
         iput(inode);
 out_dir:
-        dec_count(dir);
+        inode_dec_link_count(dir);
         goto out;
 }
 
@@ -202,7 +190,7 @@ static int minix_unlink(struct inode * dir, struct dentry *dentry)
                 goto end_unlink;
 
         inode->i_ctime = dir->i_ctime;
-        dec_count(inode);
+        inode_dec_link_count(inode);
 end_unlink:
         return err;
 }
@@ -215,8 +203,8 @@ static int minix_rmdir(struct inode * dir, struct dentry *dentry)
         if (minix_empty_dir(inode)) {
                 err = minix_unlink(dir, dentry);
                 if (!err) {
-                        dec_count(dir);
-                        dec_count(inode);
+                        inode_dec_link_count(dir);
+                        inode_dec_link_count(inode);
                 }
         }
         return err;
@@ -257,34 +245,34 @@ static int minix_rename(struct inode * old_dir, struct dentry *old_dentry,
                 new_de = minix_find_entry(new_dentry, &new_page);
                 if (!new_de)
                         goto out_dir;
-                inc_count(old_inode);
+                inode_inc_link_count(old_inode);
                 minix_set_link(new_de, new_page, old_inode);
                 new_inode->i_ctime = CURRENT_TIME_SEC;
                 if (dir_de)
                         new_inode->i_nlink--;
-                dec_count(new_inode);
+                inode_dec_link_count(new_inode);
         } else {
                 if (dir_de) {
                         err = -EMLINK;
                         if (new_dir->i_nlink >= info->s_link_max)
                                 goto out_dir;
                 }
-                inc_count(old_inode);
+                inode_inc_link_count(old_inode);
                 err = minix_add_link(new_dentry, old_inode);
                 if (err) {
-                        dec_count(old_inode);
+                        inode_dec_link_count(old_inode);
                         goto out_dir;
                 }
                 if (dir_de)
-                        inc_count(new_dir);
+                        inode_inc_link_count(new_dir);
         }
 
         minix_delete_entry(old_de, old_page);
-        dec_count(old_inode);
+        inode_dec_link_count(old_inode);
 
         if (dir_de) {
                 minix_set_link(dir_de, dir_page, new_dir);
-                dec_count(old_dir);
+                inode_dec_link_count(old_dir);
         }
         return 0;