aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext3/super.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ext3/super.c')
-rw-r--r--fs/ext3/super.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 3559086eee5f..4b95bfe4c8f7 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -62,13 +62,13 @@ static void ext3_unlockfs(struct super_block *sb);
62static void ext3_write_super (struct super_block * sb); 62static void ext3_write_super (struct super_block * sb);
63static void ext3_write_super_lockfs(struct super_block *sb); 63static void ext3_write_super_lockfs(struct super_block *sb);
64 64
65/* 65/*
66 * Wrappers for journal_start/end. 66 * Wrappers for journal_start/end.
67 * 67 *
68 * The only special thing we need to do here is to make sure that all 68 * The only special thing we need to do here is to make sure that all
69 * journal_end calls result in the superblock being marked dirty, so 69 * journal_end calls result in the superblock being marked dirty, so
70 * that sync() will call the filesystem's write_super callback if 70 * that sync() will call the filesystem's write_super callback if
71 * appropriate. 71 * appropriate.
72 */ 72 */
73handle_t *ext3_journal_start_sb(struct super_block *sb, int nblocks) 73handle_t *ext3_journal_start_sb(struct super_block *sb, int nblocks)
74{ 74{
@@ -90,11 +90,11 @@ handle_t *ext3_journal_start_sb(struct super_block *sb, int nblocks)
90 return journal_start(journal, nblocks); 90 return journal_start(journal, nblocks);
91} 91}
92 92
93/* 93/*
94 * The only special thing we need to do here is to make sure that all 94 * The only special thing we need to do here is to make sure that all
95 * journal_stop calls result in the superblock being marked dirty, so 95 * journal_stop calls result in the superblock being marked dirty, so
96 * that sync() will call the filesystem's write_super callback if 96 * that sync() will call the filesystem's write_super callback if
97 * appropriate. 97 * appropriate.
98 */ 98 */
99int __ext3_journal_stop(const char *where, handle_t *handle) 99int __ext3_journal_stop(const char *where, handle_t *handle)
100{ 100{
@@ -369,7 +369,7 @@ static void dump_orphan_list(struct super_block *sb, struct ext3_sb_info *sbi)
369{ 369{
370 struct list_head *l; 370 struct list_head *l;
371 371
372 printk(KERN_ERR "sb orphan head is %d\n", 372 printk(KERN_ERR "sb orphan head is %d\n",
373 le32_to_cpu(sbi->s_es->s_last_orphan)); 373 le32_to_cpu(sbi->s_es->s_last_orphan));
374 374
375 printk(KERN_ERR "sb_info orphan list:\n"); 375 printk(KERN_ERR "sb_info orphan list:\n");
@@ -378,7 +378,7 @@ static void dump_orphan_list(struct super_block *sb, struct ext3_sb_info *sbi)
378 printk(KERN_ERR " " 378 printk(KERN_ERR " "
379 "inode %s:%ld at %p: mode %o, nlink %d, next %d\n", 379 "inode %s:%ld at %p: mode %o, nlink %d, next %d\n",
380 inode->i_sb->s_id, inode->i_ino, inode, 380 inode->i_sb->s_id, inode->i_ino, inode,
381 inode->i_mode, inode->i_nlink, 381 inode->i_mode, inode->i_nlink,
382 NEXT_ORPHAN(inode)); 382 NEXT_ORPHAN(inode));
383 } 383 }
384} 384}
@@ -475,7 +475,7 @@ static void init_once(void * foo, kmem_cache_t * cachep, unsigned long flags)
475 inode_init_once(&ei->vfs_inode); 475 inode_init_once(&ei->vfs_inode);
476 } 476 }
477} 477}
478 478
479static int init_inodecache(void) 479static int init_inodecache(void)
480{ 480{
481 ext3_inode_cachep = kmem_cache_create("ext3_inode_cache", 481 ext3_inode_cachep = kmem_cache_create("ext3_inode_cache",
@@ -1483,7 +1483,7 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
1483 (EXT3_HAS_COMPAT_FEATURE(sb, ~0U) || 1483 (EXT3_HAS_COMPAT_FEATURE(sb, ~0U) ||
1484 EXT3_HAS_RO_COMPAT_FEATURE(sb, ~0U) || 1484 EXT3_HAS_RO_COMPAT_FEATURE(sb, ~0U) ||
1485 EXT3_HAS_INCOMPAT_FEATURE(sb, ~0U))) 1485 EXT3_HAS_INCOMPAT_FEATURE(sb, ~0U)))
1486 printk(KERN_WARNING 1486 printk(KERN_WARNING
1487 "EXT3-fs warning: feature flags set on rev 0 fs, " 1487 "EXT3-fs warning: feature flags set on rev 0 fs, "
1488 "running e2fsck is recommended\n"); 1488 "running e2fsck is recommended\n");
1489 /* 1489 /*
@@ -1509,7 +1509,7 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
1509 1509
1510 if (blocksize < EXT3_MIN_BLOCK_SIZE || 1510 if (blocksize < EXT3_MIN_BLOCK_SIZE ||
1511 blocksize > EXT3_MAX_BLOCK_SIZE) { 1511 blocksize > EXT3_MAX_BLOCK_SIZE) {
1512 printk(KERN_ERR 1512 printk(KERN_ERR
1513 "EXT3-fs: Unsupported filesystem blocksize %d on %s.\n", 1513 "EXT3-fs: Unsupported filesystem blocksize %d on %s.\n",
1514 blocksize, sb->s_id); 1514 blocksize, sb->s_id);
1515 goto failed_mount; 1515 goto failed_mount;
@@ -1533,14 +1533,14 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
1533 offset = (sb_block * EXT3_MIN_BLOCK_SIZE) % blocksize; 1533 offset = (sb_block * EXT3_MIN_BLOCK_SIZE) % blocksize;
1534 bh = sb_bread(sb, logic_sb_block); 1534 bh = sb_bread(sb, logic_sb_block);
1535 if (!bh) { 1535 if (!bh) {
1536 printk(KERN_ERR 1536 printk(KERN_ERR
1537 "EXT3-fs: Can't read superblock on 2nd try.\n"); 1537 "EXT3-fs: Can't read superblock on 2nd try.\n");
1538 goto failed_mount; 1538 goto failed_mount;
1539 } 1539 }
1540 es = (struct ext3_super_block *)(((char *)bh->b_data) + offset); 1540 es = (struct ext3_super_block *)(((char *)bh->b_data) + offset);
1541 sbi->s_es = es; 1541 sbi->s_es = es;
1542 if (es->s_magic != cpu_to_le16(EXT3_SUPER_MAGIC)) { 1542 if (es->s_magic != cpu_to_le16(EXT3_SUPER_MAGIC)) {
1543 printk (KERN_ERR 1543 printk (KERN_ERR
1544 "EXT3-fs: Magic mismatch, very weird !\n"); 1544 "EXT3-fs: Magic mismatch, very weird !\n");
1545 goto failed_mount; 1545 goto failed_mount;
1546 } 1546 }
@@ -1820,7 +1820,7 @@ out_fail:
1820/* 1820/*
1821 * Setup any per-fs journal parameters now. We'll do this both on 1821 * Setup any per-fs journal parameters now. We'll do this both on
1822 * initial mount, once the journal has been initialised but before we've 1822 * initial mount, once the journal has been initialised but before we've
1823 * done any recovery; and again on any subsequent remount. 1823 * done any recovery; and again on any subsequent remount.
1824 */ 1824 */
1825static void ext3_init_journal_params(struct super_block *sb, journal_t *journal) 1825static void ext3_init_journal_params(struct super_block *sb, journal_t *journal)
1826{ 1826{