aboutsummaryrefslogtreecommitdiffstats
path: root/fs/minix/inode.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/minix/inode.c')
-rw-r--r--fs/minix/inode.c29
1 files changed, 15 insertions, 14 deletions
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)
80{ 80{
81 minix_inode_cachep = kmem_cache_create("minix_inode_cache", 81 minix_inode_cachep = kmem_cache_create("minix_inode_cache",
82 sizeof(struct minix_inode_info), 82 sizeof(struct minix_inode_info),
83 0, SLAB_RECLAIM_ACCOUNT, 83 0, (SLAB_RECLAIM_ACCOUNT|
84 SLAB_MEM_SPREAD),
84 init_once, NULL); 85 init_once, NULL);
85 if (minix_inode_cachep == NULL) 86 if (minix_inode_cachep == NULL)
86 return -ENOMEM; 87 return -ENOMEM;
@@ -126,11 +127,11 @@ static int minix_remount (struct super_block * sb, int * flags, char * data)
126 mark_buffer_dirty(sbi->s_sbh); 127 mark_buffer_dirty(sbi->s_sbh);
127 128
128 if (!(sbi->s_mount_state & MINIX_VALID_FS)) 129 if (!(sbi->s_mount_state & MINIX_VALID_FS))
129 printk ("MINIX-fs warning: remounting unchecked fs, " 130 printk("MINIX-fs warning: remounting unchecked fs, "
130 "running fsck is recommended.\n"); 131 "running fsck is recommended\n");
131 else if ((sbi->s_mount_state & MINIX_ERROR_FS)) 132 else if ((sbi->s_mount_state & MINIX_ERROR_FS))
132 printk ("MINIX-fs warning: remounting fs with errors, " 133 printk("MINIX-fs warning: remounting fs with errors, "
133 "running fsck is recommended.\n"); 134 "running fsck is recommended\n");
134 } 135 }
135 return 0; 136 return 0;
136} 137}
@@ -244,11 +245,11 @@ static int minix_fill_super(struct super_block *s, void *data, int silent)
244 mark_buffer_dirty(bh); 245 mark_buffer_dirty(bh);
245 } 246 }
246 if (!(sbi->s_mount_state & MINIX_VALID_FS)) 247 if (!(sbi->s_mount_state & MINIX_VALID_FS))
247 printk ("MINIX-fs: mounting unchecked file system, " 248 printk("MINIX-fs: mounting unchecked file system, "
248 "running fsck is recommended.\n"); 249 "running fsck is recommended\n");
249 else if (sbi->s_mount_state & MINIX_ERROR_FS) 250 else if (sbi->s_mount_state & MINIX_ERROR_FS)
250 printk ("MINIX-fs: mounting file system with errors, " 251 printk("MINIX-fs: mounting file system with errors, "
251 "running fsck is recommended.\n"); 252 "running fsck is recommended\n");
252 return 0; 253 return 0;
253 254
254out_iput: 255out_iput:
@@ -272,19 +273,19 @@ out_no_bitmap:
272 273
273out_no_map: 274out_no_map:
274 if (!silent) 275 if (!silent)
275 printk ("MINIX-fs: can't allocate map\n"); 276 printk("MINIX-fs: can't allocate map\n");
276 goto out_release; 277 goto out_release;
277 278
278out_no_fs: 279out_no_fs:
279 if (!silent) 280 if (!silent)
280 printk("VFS: Can't find a Minix or Minix V2 filesystem on device " 281 printk("VFS: Can't find a Minix or Minix V2 filesystem "
281 "%s.\n", s->s_id); 282 "on device %s\n", s->s_id);
282 out_release: 283 out_release:
283 brelse(bh); 284 brelse(bh);
284 goto out; 285 goto out;
285 286
286out_bad_hblock: 287out_bad_hblock:
287 printk("MINIX-fs: blocksize too small for device.\n"); 288 printk("MINIX-fs: blocksize too small for device\n");
288 goto out; 289 goto out;
289 290
290out_bad_sb: 291out_bad_sb:
@@ -523,7 +524,7 @@ int minix_sync_inode(struct inode * inode)
523 sync_dirty_buffer(bh); 524 sync_dirty_buffer(bh);
524 if (buffer_req(bh) && !buffer_uptodate(bh)) 525 if (buffer_req(bh) && !buffer_uptodate(bh))
525 { 526 {
526 printk ("IO error syncing minix inode [%s:%08lx]\n", 527 printk("IO error syncing minix inode [%s:%08lx]\n",
527 inode->i_sb->s_id, inode->i_ino); 528 inode->i_sb->s_id, inode->i_ino);
528 err = -1; 529 err = -1;
529 } 530 }