1 Since we could skip corrupt block groups, this patch
2 use ext4_warning() intead of ext4_error() to make FS not
3 emount RO in default, also fix a leftover from upstream
4 commit 163a203ddb36c36d4a1c942
6 diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
7 index e069155..692b5e4 100644
10 @@ -185,25 +185,17 @@ static int ext4_init_block_bitmap(struct super_block *sb,
11 struct ext4_sb_info *sbi = EXT4_SB(sb);
12 ext4_fsblk_t start, tmp;
14 - struct ext4_group_info *grp;
16 J_ASSERT_BH(bh, buffer_locked(bh));
18 /* If checksum is bad mark all blocks used to prevent allocation
19 * essentially implementing a per-group read-only flag. */
20 if (!ext4_group_desc_csum_verify(sb, block_group, gdp)) {
21 - grp = ext4_get_group_info(sb, block_group);
22 - if (!EXT4_MB_GRP_BBITMAP_CORRUPT(grp))
23 - percpu_counter_sub(&sbi->s_freeclusters_counter,
25 - set_bit(EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT, &grp->bb_state);
26 - if (!EXT4_MB_GRP_IBITMAP_CORRUPT(grp)) {
28 - count = ext4_free_inodes_count(sb, gdp);
29 - percpu_counter_sub(&sbi->s_freeinodes_counter,
32 - set_bit(EXT4_GROUP_INFO_IBITMAP_CORRUPT_BIT, &grp->bb_state);
33 + ext4_corrupted_block_group(sb, block_group,
34 + EXT4_GROUP_INFO_BBITMAP_CORRUPT |
35 + EXT4_GROUP_INFO_IBITMAP_CORRUPT,
36 + "Checksum bad for group %u",
40 memset(bh->b_data, 0, sb->s_blocksize);
41 @@ -367,7 +359,6 @@ static void ext4_validate_block_bitmap(struct super_block *sb,
44 struct ext4_group_info *grp = ext4_get_group_info(sb, block_group);
45 - struct ext4_sb_info *sbi = EXT4_SB(sb);
47 if (buffer_verified(bh))
49 @@ -377,22 +367,19 @@ static void ext4_validate_block_bitmap(struct super_block *sb,
50 if (unlikely(!ext4_block_bitmap_csum_verify(sb, block_group,
52 ext4_unlock_group(sb, block_group);
53 - ext4_error(sb, "bg %u: bad block bitmap checksum", block_group);
54 - if (!EXT4_MB_GRP_BBITMAP_CORRUPT(grp))
55 - percpu_counter_sub(&sbi->s_freeclusters_counter,
57 - set_bit(EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT, &grp->bb_state);
58 + ext4_corrupted_block_group(sb, block_group,
59 + EXT4_GROUP_INFO_BBITMAP_CORRUPT,
60 + "bg %u: bad block bitmap checksum",
64 blk = ext4_valid_block_bitmap(sb, desc, block_group, bh);
65 if (unlikely(blk != 0)) {
66 ext4_unlock_group(sb, block_group);
67 - ext4_error(sb, "bg %u: block %llu: invalid block bitmap",
69 - if (!EXT4_MB_GRP_BBITMAP_CORRUPT(grp))
70 - percpu_counter_sub(&sbi->s_freeclusters_counter,
72 - set_bit(EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT, &grp->bb_state);
73 + ext4_corrupted_block_group(sb, block_group,
74 + EXT4_GROUP_INFO_BBITMAP_CORRUPT,
75 + "bg %u: block %llu: invalid block bitmap",
79 set_buffer_verified(bh);
80 @@ -445,8 +432,6 @@ ext4_read_block_bitmap_nowait(struct super_block *sb, ext4_group_t block_group)
81 ext4_unlock_group(sb, block_group);
84 - ext4_error(sb, "Failed to init block bitmap for group "
85 - "%u: %d", block_group, err);
89 diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
90 index 3c41773..63a63b6 100644
93 @@ -91,6 +91,17 @@ typedef __u32 ext4_lblk_t;
94 /* data type for block group number */
95 typedef unsigned int ext4_group_t;
97 +void __ext4_corrupted_block_group(struct super_block *sb,
98 + ext4_group_t group, unsigned int flags,
99 + const char *function, unsigned int line);
101 +#define ext4_corrupted_block_group(sb, group, flags, fmt, ...) \
103 + __ext4_warning(sb, __func__, __LINE__, fmt, \
105 + __ext4_corrupted_block_group(sb, group, flags, \
106 + __func__, __LINE__); \
109 * Flags used in mballoc's allocation_context flags field.
111 @@ -2673,7 +2684,11 @@ struct ext4_group_info {
112 #define EXT4_GROUP_INFO_NEED_INIT_BIT 0
113 #define EXT4_GROUP_INFO_WAS_TRIMMED_BIT 1
114 #define EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT 2
115 +#define EXT4_GROUP_INFO_BBITMAP_CORRUPT \
116 + (1 << EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT)
117 #define EXT4_GROUP_INFO_IBITMAP_CORRUPT_BIT 3
118 +#define EXT4_GROUP_INFO_IBITMAP_CORRUPT \
119 + (1 << EXT4_GROUP_INFO_IBITMAP_CORRUPT_BIT)
121 #define EXT4_MB_GRP_NEED_INIT(grp) \
122 (test_bit(EXT4_GROUP_INFO_NEED_INIT_BIT, &((grp)->bb_state)))
123 diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
124 index fc65310..92bcc8d 100644
125 --- a/fs/ext4/ialloc.c
126 +++ b/fs/ext4/ialloc.c
127 @@ -70,25 +70,15 @@ static unsigned ext4_init_inode_bitmap(struct super_block *sb,
128 ext4_group_t block_group,
129 struct ext4_group_desc *gdp)
131 - struct ext4_group_info *grp;
132 - struct ext4_sb_info *sbi = EXT4_SB(sb);
133 J_ASSERT_BH(bh, buffer_locked(bh));
135 /* If checksum is bad mark all blocks and inodes use to prevent
136 * allocation, essentially implementing a per-group read-only flag. */
137 if (!ext4_group_desc_csum_verify(sb, block_group, gdp)) {
138 - grp = ext4_get_group_info(sb, block_group);
139 - if (!EXT4_MB_GRP_BBITMAP_CORRUPT(grp))
140 - percpu_counter_sub(&sbi->s_freeclusters_counter,
142 - set_bit(EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT, &grp->bb_state);
143 - if (!EXT4_MB_GRP_IBITMAP_CORRUPT(grp)) {
145 - count = ext4_free_inodes_count(sb, gdp);
146 - percpu_counter_sub(&sbi->s_freeinodes_counter,
149 - set_bit(EXT4_GROUP_INFO_IBITMAP_CORRUPT_BIT, &grp->bb_state);
150 + ext4_corrupted_block_group(sb, block_group,
151 + EXT4_GROUP_INFO_BBITMAP_CORRUPT |
152 + EXT4_GROUP_INFO_IBITMAP_CORRUPT,
153 + "Checksum bad for group %u", block_group);
157 @@ -193,8 +180,6 @@ verify:
158 ext4_unlock_group(sb, block_group);
161 - ext4_error(sb, "Failed to init inode bitmap for group "
162 - "%u: %d", block_group, err);
166 @@ -337,14 +318,9 @@ out:
170 - ext4_error(sb, "bit already cleared for inode %lu", ino);
171 - if (gdp && !EXT4_MB_GRP_IBITMAP_CORRUPT(grp)) {
173 - count = ext4_free_inodes_count(sb, gdp);
174 - percpu_counter_sub(&sbi->s_freeinodes_counter,
177 - set_bit(EXT4_GROUP_INFO_IBITMAP_CORRUPT_BIT, &grp->bb_state);
178 + ext4_corrupted_block_group(sb, block_group,
179 + EXT4_GROUP_INFO_IBITMAP_CORRUPT,
180 + "bit already cleared for inode %lu", ino);
184 diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
185 index 7282d07..e6805e6 100644
186 --- a/fs/ext4/mballoc.c
187 +++ b/fs/ext4/mballoc.c
188 @@ -752,10 +752,18 @@ int ext4_mb_generate_buddy(struct super_block *sb,
189 if (free != grp->bb_free) {
190 struct ext4_group_desc *gdp;
191 gdp = ext4_get_group_desc(sb, group, NULL);
192 - ext4_error(sb, "group %lu: %u blocks in bitmap, %u in bb, "
193 - "%u in gd, %lu pa's\n", (long unsigned int)group,
194 - free, grp->bb_free, ext4_free_group_clusters(sb, gdp),
195 - grp->bb_prealloc_nr);
197 + ext4_corrupted_block_group(sb, group,
198 + EXT4_GROUP_INFO_BBITMAP_CORRUPT,
199 + "group %lu: %u blocks in bitmap, %u in bb, %u in gd, %lu pa's block bitmap corrupt",
200 + (unsigned long int)group, free, grp->bb_free,
201 + ext4_free_group_clusters(sb, gdp),
202 + grp->bb_prealloc_nr);
204 + * If we intend to continue, we consider group descriptor
205 + * corrupt and update bb_free using bitmap value
207 + grp->bb_free = free;
210 mb_set_largest_free_order(sb, grp);
211 @@ -1101,7 +1109,7 @@ ext4_mb_load_buddy(struct super_block *sb, ext4_group_t group,
216 + struct page *page = NULL;
218 struct ext4_group_info *grp;
219 struct ext4_sb_info *sbi = EXT4_SB(sb);
220 @@ -1127,7 +1135,7 @@ ext4_mb_load_buddy(struct super_block *sb, ext4_group_t group,
222 ret = ext4_mb_init_group(sb, group);
229 @@ -1227,6 +1235,7 @@ err:
230 page_cache_release(e4b->bd_buddy_page);
231 e4b->bd_buddy = NULL;
232 e4b->bd_bitmap = NULL;
233 + ext4_warning(sb, "Error loading buddy information for %u", group);
237 @@ -3599,9 +3608,11 @@ int ext4_mb_check_ondisk_bitmap(struct super_block *sb, void *bitmap,
240 if (free != free_in_gdp) {
241 - ext4_error(sb, "on-disk bitmap for group %d"
242 - "corrupted: %u blocks free in bitmap, %u - in gd\n",
243 - group, free, free_in_gdp);
244 + ext4_corrupted_block_group(sb, group,
245 + EXT4_GROUP_INFO_BBITMAP_CORRUPT,
246 + "on-disk bitmap for group %d corrupted: %u blocks free in bitmap, %u - in gd\n",
252 @@ -3962,16 +3973,8 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
253 /* "free < pa->pa_free" means we maybe double alloc the same blocks,
254 * otherwise maybe leave some free blocks unavailable, no need to BUG.*/
255 if ((free > pa->pa_free && !pa->pa_error) || (free < pa->pa_free)) {
256 - ext4_error(sb, "pa free mismatch: [pa %p] "
257 - "[phy %lu] [logic %lu] [len %u] [free %u] "
258 - "[error %u] [inode %lu] [freed %u]", pa,
259 - (unsigned long)pa->pa_pstart,
260 - (unsigned long)pa->pa_lstart,
261 - (unsigned)pa->pa_len, (unsigned)pa->pa_free,
262 - (unsigned)pa->pa_error, pa->pa_inode->i_ino,
264 ext4_grp_locked_error(sb, group, 0, 0, "free %u, pa_free %u",
265 - free, pa->pa_free);
266 + free, pa->pa_free);
268 * pa is already deleted so we use the value obtained
269 * from the bitmap and continue.
270 @@ -4031,15 +4034,11 @@ ext4_mb_discard_group_preallocations(struct super_block *sb,
271 bitmap_bh = ext4_read_block_bitmap(sb, group);
272 if (IS_ERR(bitmap_bh)) {
273 err = PTR_ERR(bitmap_bh);
274 - ext4_error(sb, "Error %d reading block bitmap for %u",
279 err = ext4_mb_load_buddy(sb, group, &e4b);
281 - ext4_warning(sb, "Error %d loading buddy information for %u",
286 @@ -4198,17 +4198,12 @@ repeat:
288 err = ext4_mb_load_buddy_gfp(sb, group, &e4b,
289 GFP_NOFS|__GFP_NOFAIL);
291 - ext4_error(sb, "Error %d loading buddy information for %u",
297 bitmap_bh = ext4_read_block_bitmap(sb, group);
298 if (IS_ERR(bitmap_bh)) {
299 err = PTR_ERR(bitmap_bh);
300 - ext4_error(sb, "Error %d reading block bitmap for %u",
302 ext4_mb_unload_buddy(&e4b);
305 @@ -4467,11 +4462,8 @@ ext4_mb_discard_lg_preallocations(struct super_block *sb,
307 err = ext4_mb_load_buddy_gfp(sb, group, &e4b,
308 GFP_NOFS|__GFP_NOFAIL);
310 - ext4_error(sb, "Error %d loading buddy information for %u",
315 ext4_lock_group(sb, group);
316 list_del(&pa->pa_group_list);
317 ext4_get_group_info(sb, group)->bb_prealloc_nr--;
318 @@ -4742,17 +4734,18 @@ errout:
319 * been updated or not when fail case. So can
320 * not revert pa_free back, just mark pa_error*/
323 - "Updating bitmap error: [err %d] "
324 - "[pa %p] [phy %lu] [logic %lu] "
325 - "[len %u] [free %u] [error %u] "
326 - "[inode %lu]", *errp, pa,
327 - (unsigned long)pa->pa_pstart,
328 - (unsigned long)pa->pa_lstart,
329 - (unsigned)pa->pa_len,
330 - (unsigned)pa->pa_free,
331 - (unsigned)pa->pa_error,
332 - pa->pa_inode ? pa->pa_inode->i_ino : 0);
333 + ext4_corrupted_block_group(sb, 0, 0,
334 + "Updating bitmap error: [err %d] "
335 + "[pa %p] [phy %lu] [logic %lu] "
336 + "[len %u] [free %u] [error %u] "
337 + "[inode %lu]", *errp, pa,
338 + (unsigned long)pa->pa_pstart,
339 + (unsigned long)pa->pa_lstart,
340 + (unsigned)pa->pa_len,
341 + (unsigned)pa->pa_free,
342 + (unsigned)pa->pa_error,
344 + pa->pa_inode->i_ino : 0);
347 ext4_mb_release_context(ac);
348 @@ -5037,7 +5030,7 @@ do_more:
350 err = ext4_mb_load_buddy(sb, block_group, &e4b);
355 if ((flags & EXT4_FREE_BLOCKS_METADATA) && ext4_handle_valid(handle)) {
356 struct ext4_free_data *new_entry;
357 @@ -5119,8 +5112,9 @@ do_more:
362 ext4_std_error(sb, err);
368 @@ -5216,7 +5210,7 @@ int ext4_group_add_blocks(handle_t *handle, struct super_block *sb,
370 err = ext4_mb_load_buddy(sb, block_group, &e4b);
376 * need to update group_info->bb_free and bitmap
377 @@ -5253,8 +5247,9 @@ int ext4_group_add_blocks(handle_t *handle, struct super_block *sb,
382 ext4_std_error(sb, err);
388 @@ -5329,11 +5324,9 @@ ext4_trim_all_free(struct super_block *sb, ext4_group_t group,
389 trace_ext4_trim_all_free(sb, group, start, max);
391 ret = ext4_mb_load_buddy(sb, group, &e4b);
393 - ext4_warning(sb, "Error %d loading buddy information for %u",
399 bitmap = e4b.bd_bitmap;
401 ext4_lock_group(sb, group);
402 diff --git a/fs/ext4/super.c b/fs/ext4/super.c
403 index c625960..0de22f2 100644
404 --- a/fs/ext4/super.c
405 +++ b/fs/ext4/super.c
406 @@ -633,6 +633,37 @@ void __ext4_warning(struct super_block *sb, const char *function,
410 +void __ext4_corrupted_block_group(struct super_block *sb, ext4_group_t group,
411 + unsigned int flags, const char *function,
414 + struct ext4_sb_info *sbi = EXT4_SB(sb);
415 + struct ext4_group_info *grp = ext4_get_group_info(sb, group);
416 + struct ext4_group_desc *gdp = ext4_get_group_desc(sb, group, NULL);
418 + if (flags & EXT4_GROUP_INFO_BBITMAP_CORRUPT &&
419 + !EXT4_MB_GRP_BBITMAP_CORRUPT(grp)) {
420 + percpu_counter_sub(&sbi->s_freeclusters_counter,
422 + set_bit(EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT,
426 + if (flags & EXT4_GROUP_INFO_IBITMAP_CORRUPT &&
427 + !EXT4_MB_GRP_IBITMAP_CORRUPT(grp)) {
431 + count = ext4_free_inodes_count(sb, gdp);
432 + percpu_counter_sub(&sbi->s_freeinodes_counter,
435 + set_bit(EXT4_GROUP_INFO_IBITMAP_CORRUPT_BIT,
438 + save_error_info(sb, function, line);
441 void __ext4_grp_locked_error(const char *function, unsigned int line,
442 struct super_block *sb, ext4_group_t grp,
443 unsigned long ino, ext4_fsblk_t block,