Merge tag 'xfs-4.18-merge-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

[linux-2.6-microblaze.git] / fs / ext4 / super.c

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 2e16229..7022d84 100644 (file)
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -763,6 +763,36 @@ __acquires(bitlock)
        return;
 }
 
+void ext4_mark_group_bitmap_corrupted(struct super_block *sb,
+                                    ext4_group_t group,
+                                    unsigned int flags)
+{
+       struct ext4_sb_info *sbi = EXT4_SB(sb);
+       struct ext4_group_info *grp = ext4_get_group_info(sb, group);
+       struct ext4_group_desc *gdp = ext4_get_group_desc(sb, group, NULL);
+
+       if ((flags & EXT4_GROUP_INFO_BBITMAP_CORRUPT) &&
+           !EXT4_MB_GRP_BBITMAP_CORRUPT(grp)) {
+               percpu_counter_sub(&sbi->s_freeclusters_counter,
+                                       grp->bb_free);
+               set_bit(EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT,
+                       &grp->bb_state);
+       }
+
+       if ((flags & EXT4_GROUP_INFO_IBITMAP_CORRUPT) &&
+           !EXT4_MB_GRP_IBITMAP_CORRUPT(grp)) {
+               if (gdp) {
+                       int count;
+
+                       count = ext4_free_inodes_count(sb, gdp);
+                       percpu_counter_sub(&sbi->s_freeinodes_counter,
+                                          count);
+               }
+               set_bit(EXT4_GROUP_INFO_IBITMAP_CORRUPT_BIT,
+                       &grp->bb_state);
+       }
+}
+
 void ext4_update_dynamic_rev(struct super_block *sb)
 {
        struct ext4_super_block *es = EXT4_SB(sb)->s_es;
@@ -2116,12 +2146,12 @@ static int ext4_setup_super(struct super_block *sb, struct ext4_super_block *es,
                            int read_only)
 {
        struct ext4_sb_info *sbi = EXT4_SB(sb);
-       int res = 0;
+       int err = 0;
 
        if (le32_to_cpu(es->s_rev_level) > EXT4_MAX_SUPP_REV) {
                ext4_msg(sb, KERN_ERR, "revision level too high, "
                         "forcing read-only mode");
-               res = SB_RDONLY;
+               err = -EROFS;
        }
        if (read_only)
                goto done;
@@ -2154,7 +2184,7 @@ static int ext4_setup_super(struct super_block *sb, struct ext4_super_block *es,
        if (sbi->s_journal)
                ext4_set_feature_journal_needs_recovery(sb);
 
-       ext4_commit_super(sb, 1);
+       err = ext4_commit_super(sb, 1);
 done:
        if (test_opt(sb, DEBUG))
                printk(KERN_INFO "[EXT4 FS bs=%lu, gc=%u, "
@@ -2166,7 +2196,7 @@ done:
                        sbi->s_mount_opt, sbi->s_mount_opt2);
 
        cleancache_init_fs(sb);
-       return res;
+       return err;
 }
 
 int ext4_alloc_flex_bg_array(struct super_block *sb, ext4_group_t ngroup)
@@ -4223,8 +4253,12 @@ no_journal:
                goto failed_mount4;
        }
 
-       if (ext4_setup_super(sb, es, sb_rdonly(sb)))
+       ret = ext4_setup_super(sb, es, sb_rdonly(sb));
+       if (ret == -EROFS) {
                sb->s_flags |= SB_RDONLY;
+               ret = 0;
+       } else if (ret)
+               goto failed_mount4a;
 
        /* determine the minimum size of new large inodes, if present */
        if (sbi->s_inode_size > EXT4_GOOD_OLD_INODE_SIZE &&
@@ -4759,11 +4793,7 @@ static int ext4_commit_super(struct super_block *sb, int sync)
                unlock_buffer(sbh);
                error = __sync_dirty_buffer(sbh,
                        REQ_SYNC | (test_opt(sb, BARRIER) ? REQ_FUA : 0));
-               if (error)
-                       return error;
-
-               error = buffer_write_io_error(sbh);
-               if (error) {
+               if (buffer_write_io_error(sbh)) {
                        ext4_msg(sb, KERN_ERR, "I/O error while writing "
                               "superblock");
                        clear_buffer_write_io_error(sbh);
@@ -5164,8 +5194,12 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)
                        if (sbi->s_journal)
                                ext4_clear_journal_err(sb, es);
                        sbi->s_mount_state = le16_to_cpu(es->s_state);
-                       if (!ext4_setup_super(sb, es, 0))
-                               sb->s_flags &= ~SB_RDONLY;
+
+                       err = ext4_setup_super(sb, es, 0);
+                       if (err)
+                               goto restore_opts;
+
+                       sb->s_flags &= ~SB_RDONLY;
                        if (ext4_has_feature_mmp(sb))
                                if (ext4_multi_mount_protect(sb,
                                                le64_to_cpu(es->s_mmp_block))) {
@@ -5189,8 +5223,11 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)
        }
 
        ext4_setup_system_zone(sb);
-       if (sbi->s_journal == NULL && !(old_sb_flags & SB_RDONLY))
-               ext4_commit_super(sb, 1);
+       if (sbi->s_journal == NULL && !(old_sb_flags & SB_RDONLY)) {
+               err = ext4_commit_super(sb, 1);
+               if (err)
+                       goto restore_opts;
+       }
 
 #ifdef CONFIG_QUOTA
        /* Release old quota file names */
@@ -5251,7 +5288,8 @@ static int ext4_statfs_project(struct super_block *sb,
                 dquot->dq_dqb.dqb_bsoftlimit :
                 dquot->dq_dqb.dqb_bhardlimit) >> sb->s_blocksize_bits;
        if (limit && buf->f_blocks > limit) {
-               curblock = dquot->dq_dqb.dqb_curspace >> sb->s_blocksize_bits;
+               curblock = (dquot->dq_dqb.dqb_curspace +
+                           dquot->dq_dqb.dqb_rsvspace) >> sb->s_blocksize_bits;
                buf->f_blocks = limit;
                buf->f_bfree = buf->f_bavail =
                        (buf->f_blocks > curblock) ?