2 * pass3.c -- pass #3 of e2fsck: Check for directory connectivity
4 * Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999 Theodore Ts'o.
7 * This file may be redistributed under the terms of the GNU Public
11 * Pass #3 assures that all directories are connected to the
12 * filesystem tree, using the following algorithm:
14 * First, the root directory is checked to make sure it exists; if
15 * not, e2fsck will offer to create a new one. It is then marked as
18 * Then, pass3 interates over all directory inodes; for each directory
19 * it attempts to trace up the filesystem tree, using dirinfo.parent
20 * until it reaches a directory which has been marked "done". If it
21 * can not do so, then the directory must be disconnected, and e2fsck
22 * will offer to reconnect it to /lost+found. While it is chasing
23 * parent pointers up the filesystem tree, if pass3 sees a directory
24 * twice, then it has detected a filesystem loop, and it will again
25 * offer to reconnect the directory to /lost+found in to break the
28 * Pass 3 also contains the subroutine, e2fsck_reconnect_file() to
29 * reconnect inodes to /lost+found; this subroutine is also used by
30 * pass 4. e2fsck_reconnect_file() calls get_lost_and_found(), which
31 * is responsible for creating /lost+found if it does not exist.
33 * Pass 3 frees the following data structures:
34 * - The dirinfo directory information cache.
45 static void check_root(e2fsck_t ctx
);
46 static int check_directory(e2fsck_t ctx
, ext2_ino_t ino
,
47 struct problem_context
*pctx
);
48 static void fix_dotdot(e2fsck_t ctx
, ext2_ino_t ino
, ext2_ino_t parent
);
50 static ext2fs_inode_bitmap inode_loop_detect
= 0;
51 static ext2fs_inode_bitmap inode_done_map
= 0;
53 void e2fsck_pass3(e2fsck_t ctx
)
55 ext2_filsys fs
= ctx
->fs
;
56 struct dir_info_iter
*iter
= NULL
;
58 struct resource_track rtrack
;
60 struct problem_context pctx
;
62 unsigned long maxdirs
, count
;
64 init_resource_track(&rtrack
, ctx
->fs
->io
);
65 clear_problem_context(&pctx
);
68 mtrace_print("Pass 3");
71 if (!(ctx
->options
& E2F_OPT_PREEN
))
72 fix_problem(ctx
, PR_3_PASS_HEADER
, &pctx
);
75 * Allocate some bitmaps to do loop detection.
77 pctx
.errcode
= e2fsck_allocate_inode_bitmap(fs
, _("inode done bitmap"),
78 EXT2FS_BMAP64_AUTODIR
,
79 "inode_done_map", &inode_done_map
);
82 fix_problem(ctx
, PR_3_ALLOCATE_IBITMAP_ERROR
, &pctx
);
83 ctx
->flags
|= E2F_FLAG_ABORT
;
86 print_resource_track(ctx
, _("Peak memory"), &ctx
->global_rtrack
, NULL
);
89 if (ctx
->flags
& E2F_FLAG_SIGNAL_MASK
)
92 ext2fs_mark_inode_bitmap2(inode_done_map
, EXT2_ROOT_INO
);
94 maxdirs
= e2fsck_get_num_dirinfo(ctx
);
98 if ((ctx
->progress
)(ctx
, 3, 0, maxdirs
))
101 iter
= e2fsck_dir_info_iter_begin(ctx
);
102 while ((dir
= e2fsck_dir_info_iter(ctx
, iter
)) != 0) {
103 if (ctx
->flags
& E2F_FLAG_SIGNAL_MASK
)
105 if (ctx
->progress
&& (ctx
->progress
)(ctx
, 3, count
++, maxdirs
))
107 if (ext2fs_test_inode_bitmap2(ctx
->inode_dir_map
, dir
->ino
))
108 if (check_directory(ctx
, dir
->ino
, &pctx
))
113 * Force the creation of /lost+found if not present
115 if ((ctx
->options
& E2F_OPT_READONLY
) == 0)
116 e2fsck_get_lost_and_found(ctx
, 1);
119 * If there are any directories that need to be indexed or
120 * optimized, do it here.
122 e2fsck_rehash_directories(ctx
);
126 e2fsck_dir_info_iter_end(ctx
, iter
);
127 e2fsck_free_dir_info(ctx
);
128 if (inode_loop_detect
) {
129 ext2fs_free_inode_bitmap(inode_loop_detect
);
130 inode_loop_detect
= 0;
132 if (inode_done_map
) {
133 ext2fs_free_inode_bitmap(inode_done_map
);
137 print_resource_track(ctx
, _("Pass 3"), &rtrack
, ctx
->fs
->io
);
141 * This makes sure the root inode is present; if not, we ask if the
142 * user wants us to create it. Not creating it is a fatal error.
144 static void check_root(e2fsck_t ctx
)
146 ext2_filsys fs
= ctx
->fs
;
148 struct ext2_inode inode
;
150 struct problem_context pctx
;
152 clear_problem_context(&pctx
);
154 if (ext2fs_test_inode_bitmap2(ctx
->inode_used_map
, EXT2_ROOT_INO
)) {
156 * If the root inode is not a directory, die here. The
157 * user must have answered 'no' in pass1 when we
158 * offered to clear it.
160 if (!(ext2fs_test_inode_bitmap2(ctx
->inode_dir_map
,
162 fix_problem(ctx
, PR_3_ROOT_NOT_DIR_ABORT
, &pctx
);
163 ctx
->flags
|= E2F_FLAG_ABORT
;
168 if (!fix_problem(ctx
, PR_3_NO_ROOT_INODE
, &pctx
)) {
169 fix_problem(ctx
, PR_3_NO_ROOT_INODE_ABORT
, &pctx
);
170 ctx
->flags
|= E2F_FLAG_ABORT
;
174 e2fsck_read_bitmaps(ctx
);
177 * First, find a free block
179 pctx
.errcode
= ext2fs_new_block2(fs
, 0, ctx
->block_found_map
, &blk
);
181 pctx
.str
= "ext2fs_new_block";
182 fix_problem(ctx
, PR_3_CREATE_ROOT_ERROR
, &pctx
);
183 ctx
->flags
|= E2F_FLAG_ABORT
;
186 ext2fs_mark_block_bitmap2(ctx
->block_found_map
, blk
);
187 ext2fs_mark_block_bitmap2(fs
->block_map
, blk
);
188 ext2fs_mark_bb_dirty(fs
);
191 * Now let's create the actual data block for the inode
193 pctx
.errcode
= ext2fs_new_dir_block(fs
, EXT2_ROOT_INO
, EXT2_ROOT_INO
,
196 pctx
.str
= "ext2fs_new_dir_block";
197 fix_problem(ctx
, PR_3_CREATE_ROOT_ERROR
, &pctx
);
198 ctx
->flags
|= E2F_FLAG_ABORT
;
202 pctx
.errcode
= ext2fs_write_dir_block4(fs
, blk
, block
, 0,
205 pctx
.str
= "ext2fs_write_dir_block4";
206 fix_problem(ctx
, PR_3_CREATE_ROOT_ERROR
, &pctx
);
207 ctx
->flags
|= E2F_FLAG_ABORT
;
210 ext2fs_free_mem(&block
);
213 * Set up the inode structure
215 memset(&inode
, 0, sizeof(inode
));
216 inode
.i_mode
= 040755;
217 inode
.i_size
= fs
->blocksize
;
218 inode
.i_atime
= inode
.i_ctime
= inode
.i_mtime
= ctx
->now
;
219 inode
.i_links_count
= 2;
220 ext2fs_iblk_set(fs
, &inode
, 1);
221 inode
.i_block
[0] = blk
;
224 * Write out the inode.
226 pctx
.errcode
= ext2fs_write_new_inode(fs
, EXT2_ROOT_INO
, &inode
);
228 pctx
.str
= "ext2fs_write_inode";
229 fix_problem(ctx
, PR_3_CREATE_ROOT_ERROR
, &pctx
);
230 ctx
->flags
|= E2F_FLAG_ABORT
;
235 * Miscellaneous bookkeeping...
237 e2fsck_add_dir_info(ctx
, EXT2_ROOT_INO
, EXT2_ROOT_INO
);
238 ext2fs_icount_store(ctx
->inode_count
, EXT2_ROOT_INO
, 2);
239 ext2fs_icount_store(ctx
->inode_link_info
, EXT2_ROOT_INO
, 2);
241 ext2fs_mark_inode_bitmap2(ctx
->inode_used_map
, EXT2_ROOT_INO
);
242 ext2fs_mark_inode_bitmap2(ctx
->inode_dir_map
, EXT2_ROOT_INO
);
243 ext2fs_mark_inode_bitmap2(fs
->inode_map
, EXT2_ROOT_INO
);
244 ext2fs_mark_ib_dirty(fs
);
248 * This subroutine is responsible for making sure that a particular
249 * directory is connected to the root; if it isn't we trace it up as
250 * far as we can go, and then offer to connect the resulting parent to
251 * the lost+found. We have to do loop detection; if we ever discover
252 * a loop, we treat that as a disconnected directory and offer to
253 * reparent it to lost+found.
255 * However, loop detection is expensive, because for very large
256 * filesystems, the inode_loop_detect bitmap is huge, and clearing it
257 * is non-trivial. Loops in filesystems are also a rare error case,
258 * and we shouldn't optimize for error cases. So we try two passes of
259 * the algorithm. The first time, we ignore loop detection and merely
260 * increment a counter; if the counter exceeds some extreme threshold,
261 * then we try again with the loop detection bitmap enabled.
263 static int check_directory(e2fsck_t ctx
, ext2_ino_t dir
,
264 struct problem_context
*pctx
)
266 ext2_filsys fs
= ctx
->fs
;
267 ext2_ino_t ino
= dir
, parent
;
268 int loop_pass
= 0, parent_count
= 0;
272 * Mark this inode as being "done"; by the time we
273 * return from this function, the inode we either be
274 * verified as being connected to the directory tree,
275 * or we will have offered to reconnect this to
278 * If it was marked done already, then we've reached a
279 * parent we've already checked.
281 if (ext2fs_mark_inode_bitmap2(inode_done_map
, ino
))
284 if (e2fsck_dir_info_get_parent(ctx
, ino
, &parent
)) {
285 fix_problem(ctx
, PR_3_NO_DIRINFO
, pctx
);
290 * If this directory doesn't have a parent, or we've
291 * seen the parent once already, then offer to
292 * reparent it to lost+found
296 (ext2fs_test_inode_bitmap2(inode_loop_detect
,
299 if (fix_problem(ctx
, PR_3_UNCONNECTED_DIR
, pctx
)) {
300 if (e2fsck_reconnect_file(ctx
, pctx
->ino
))
301 ext2fs_unmark_valid(fs
);
303 fix_dotdot(ctx
, pctx
->ino
,
304 ctx
->lost_and_found
);
305 parent
= ctx
->lost_and_found
;
312 ext2fs_mark_inode_bitmap2(inode_loop_detect
, ino
);
313 } else if (parent_count
++ > 2048) {
315 * If we've run into a path depth that's
316 * greater than 2048, try again with the inode
317 * loop bitmap turned on and start from the
321 if (inode_loop_detect
)
322 ext2fs_clear_inode_bitmap(inode_loop_detect
);
324 pctx
->errcode
= e2fsck_allocate_inode_bitmap(fs
, _("inode loop detection bitmap"), EXT2FS_BMAP64_AUTODIR
, "inode_loop_detect", &inode_loop_detect
);
328 PR_3_ALLOCATE_IBITMAP_ERROR
, pctx
);
329 ctx
->flags
|= E2F_FLAG_ABORT
;
338 * Make sure that .. and the parent directory are the same;
339 * offer to fix it if not.
342 if (e2fsck_dir_info_get_dotdot(ctx
, dir
, &pctx
->ino2
) ||
343 e2fsck_dir_info_get_parent(ctx
, dir
, &pctx
->dir
)) {
344 fix_problem(ctx
, PR_3_NO_DIRINFO
, pctx
);
347 if (pctx
->ino2
!= pctx
->dir
) {
348 if (fix_problem(ctx
, PR_3_BAD_DOT_DOT
, pctx
))
349 fix_dotdot(ctx
, dir
, pctx
->dir
);
355 * This routine gets the lost_and_found inode, making it a directory
358 ext2_ino_t
e2fsck_get_lost_and_found(e2fsck_t ctx
, int fix
)
360 ext2_filsys fs
= ctx
->fs
;
364 struct ext2_inode inode
;
366 static const char name
[] = "lost+found";
367 struct problem_context pctx
;
369 if (ctx
->lost_and_found
)
370 return ctx
->lost_and_found
;
372 clear_problem_context(&pctx
);
374 retval
= ext2fs_lookup(fs
, EXT2_ROOT_INO
, name
,
375 sizeof(name
)-1, 0, &ino
);
379 if (ext2fs_check_directory(fs
, ino
) == 0) {
380 ctx
->lost_and_found
= ino
;
384 /* Lost+found isn't a directory! */
388 if (!fix_problem(ctx
, PR_3_LPF_NOTDIR
, &pctx
))
391 /* OK, unlink the old /lost+found file. */
392 pctx
.errcode
= ext2fs_unlink(fs
, EXT2_ROOT_INO
, name
, ino
, 0);
394 pctx
.str
= "ext2fs_unlink";
395 fix_problem(ctx
, PR_3_CREATE_LPF_ERROR
, &pctx
);
398 (void) e2fsck_dir_info_set_parent(ctx
, ino
, 0);
399 e2fsck_adjust_inode_count(ctx
, ino
, -1);
400 } else if (retval
!= EXT2_ET_FILE_NOT_FOUND
) {
401 pctx
.errcode
= retval
;
402 fix_problem(ctx
, PR_3_ERR_FIND_LPF
, &pctx
);
404 if (!fix_problem(ctx
, PR_3_NO_LF_DIR
, 0))
408 * Read the inode and block bitmaps in; we'll be messing with
411 e2fsck_read_bitmaps(ctx
);
414 * First, find a free block
416 retval
= ext2fs_new_block2(fs
, 0, ctx
->block_found_map
, &blk
);
418 pctx
.errcode
= retval
;
419 fix_problem(ctx
, PR_3_ERR_LPF_NEW_BLOCK
, &pctx
);
422 ext2fs_mark_block_bitmap2(ctx
->block_found_map
, blk
);
423 ext2fs_block_alloc_stats2(fs
, blk
, +1);
426 * Next find a free inode.
428 retval
= ext2fs_new_inode(fs
, EXT2_ROOT_INO
, 040700,
429 ctx
->inode_used_map
, &ino
);
431 pctx
.errcode
= retval
;
432 fix_problem(ctx
, PR_3_ERR_LPF_NEW_INODE
, &pctx
);
435 ext2fs_mark_inode_bitmap2(ctx
->inode_used_map
, ino
);
436 ext2fs_mark_inode_bitmap2(ctx
->inode_dir_map
, ino
);
437 ext2fs_inode_alloc_stats2(fs
, ino
, +1, 1);
440 * Now let's create the actual data block for the inode
442 retval
= ext2fs_new_dir_block(fs
, ino
, EXT2_ROOT_INO
, &block
);
444 pctx
.errcode
= retval
;
445 fix_problem(ctx
, PR_3_ERR_LPF_NEW_DIR_BLOCK
, &pctx
);
449 retval
= ext2fs_write_dir_block4(fs
, blk
, block
, 0, ino
);
450 ext2fs_free_mem(&block
);
452 pctx
.errcode
= retval
;
453 fix_problem(ctx
, PR_3_ERR_LPF_WRITE_BLOCK
, &pctx
);
458 * Set up the inode structure
460 memset(&inode
, 0, sizeof(inode
));
461 inode
.i_mode
= 040700;
462 inode
.i_size
= fs
->blocksize
;
463 inode
.i_atime
= inode
.i_ctime
= inode
.i_mtime
= ctx
->now
;
464 inode
.i_links_count
= 2;
465 ext2fs_iblk_set(fs
, &inode
, 1);
466 inode
.i_block
[0] = blk
;
469 * Next, write out the inode.
471 pctx
.errcode
= ext2fs_write_new_inode(fs
, ino
, &inode
);
473 pctx
.str
= "ext2fs_write_inode";
474 fix_problem(ctx
, PR_3_CREATE_LPF_ERROR
, &pctx
);
478 * Finally, create the directory link
480 pctx
.errcode
= ext2fs_link(fs
, EXT2_ROOT_INO
, name
, ino
, EXT2_FT_DIR
);
482 pctx
.str
= "ext2fs_link";
483 fix_problem(ctx
, PR_3_CREATE_LPF_ERROR
, &pctx
);
488 * Miscellaneous bookkeeping that needs to be kept straight.
490 e2fsck_add_dir_info(ctx
, ino
, EXT2_ROOT_INO
);
491 e2fsck_adjust_inode_count(ctx
, EXT2_ROOT_INO
, 1);
492 ext2fs_icount_store(ctx
->inode_count
, ino
, 2);
493 ext2fs_icount_store(ctx
->inode_link_info
, ino
, 2);
494 ctx
->lost_and_found
= ino
;
495 quota_data_add(ctx
->qctx
, &inode
, ino
, fs
->blocksize
);
496 quota_data_inodes(ctx
->qctx
, &inode
, ino
, +1);
498 printf("/lost+found created; inode #%lu\n", ino
);
504 * This routine will connect a file to lost+found
506 int e2fsck_reconnect_file(e2fsck_t ctx
, ext2_ino_t ino
)
508 ext2_filsys fs
= ctx
->fs
;
511 struct problem_context pctx
;
512 struct ext2_inode inode
;
515 clear_problem_context(&pctx
);
518 if (!ctx
->bad_lost_and_found
&& !ctx
->lost_and_found
) {
519 if (e2fsck_get_lost_and_found(ctx
, 1) == 0)
520 ctx
->bad_lost_and_found
++;
522 if (ctx
->bad_lost_and_found
) {
523 fix_problem(ctx
, PR_3_NO_LPF
, &pctx
);
527 sprintf(name
, "#%u", ino
);
528 if (ext2fs_read_inode(fs
, ino
, &inode
) == 0)
529 file_type
= ext2_file_type(inode
.i_mode
);
530 retval
= ext2fs_link(fs
, ctx
->lost_and_found
, name
, ino
, file_type
);
531 if (retval
== EXT2_ET_DIR_NO_SPACE
) {
532 if (!fix_problem(ctx
, PR_3_EXPAND_LF_DIR
, &pctx
))
534 retval
= e2fsck_expand_directory(ctx
, ctx
->lost_and_found
,
537 pctx
.errcode
= retval
;
538 fix_problem(ctx
, PR_3_CANT_EXPAND_LPF
, &pctx
);
541 retval
= ext2fs_link(fs
, ctx
->lost_and_found
, name
,
545 pctx
.errcode
= retval
;
546 fix_problem(ctx
, PR_3_CANT_RECONNECT
, &pctx
);
549 e2fsck_adjust_inode_count(ctx
, ino
, 1);
555 * Utility routine to adjust the inode counts on an inode.
557 errcode_t
e2fsck_adjust_inode_count(e2fsck_t ctx
, ext2_ino_t ino
, int adj
)
559 ext2_filsys fs
= ctx
->fs
;
561 struct ext2_inode inode
;
566 retval
= ext2fs_read_inode(fs
, ino
, &inode
);
571 printf("Adjusting link count for inode %lu by %d (from %d)\n", ino
, adj
,
572 inode
.i_links_count
);
576 ext2fs_icount_increment(ctx
->inode_count
, ino
, 0);
577 if (inode
.i_links_count
== (__u16
) ~0)
579 ext2fs_icount_increment(ctx
->inode_link_info
, ino
, 0);
580 inode
.i_links_count
++;
581 } else if (adj
== -1) {
582 ext2fs_icount_decrement(ctx
->inode_count
, ino
, 0);
583 if (inode
.i_links_count
== 0)
585 ext2fs_icount_decrement(ctx
->inode_link_info
, ino
, 0);
586 inode
.i_links_count
--;
589 retval
= ext2fs_write_inode(fs
, ino
, &inode
);
597 * Fix parent --- this routine fixes up the parent of a directory.
599 struct fix_dotdot_struct
{
606 static int fix_dotdot_proc(struct ext2_dir_entry
*dirent
,
607 int offset
EXT2FS_ATTR((unused
)),
608 int blocksize
EXT2FS_ATTR((unused
)),
609 char *buf
EXT2FS_ATTR((unused
)),
612 struct fix_dotdot_struct
*fp
= (struct fix_dotdot_struct
*) priv_data
;
614 struct problem_context pctx
;
616 if (ext2fs_dirent_name_len(dirent
) != 2)
618 if (strncmp(dirent
->name
, "..", 2))
621 clear_problem_context(&pctx
);
623 retval
= e2fsck_adjust_inode_count(fp
->ctx
, dirent
->inode
, -1);
625 pctx
.errcode
= retval
;
626 fix_problem(fp
->ctx
, PR_3_ADJUST_INODE
, &pctx
);
628 retval
= e2fsck_adjust_inode_count(fp
->ctx
, fp
->parent
, 1);
630 pctx
.errcode
= retval
;
631 fix_problem(fp
->ctx
, PR_3_ADJUST_INODE
, &pctx
);
633 dirent
->inode
= fp
->parent
;
634 if (fp
->ctx
->fs
->super
->s_feature_incompat
&
635 EXT2_FEATURE_INCOMPAT_FILETYPE
)
636 ext2fs_dirent_set_file_type(dirent
, EXT2_FT_DIR
);
638 ext2fs_dirent_set_file_type(dirent
, EXT2_FT_UNKNOWN
);
641 return DIRENT_ABORT
| DIRENT_CHANGED
;
644 static void fix_dotdot(e2fsck_t ctx
, ext2_ino_t ino
, ext2_ino_t parent
)
646 ext2_filsys fs
= ctx
->fs
;
648 struct fix_dotdot_struct fp
;
649 struct problem_context pctx
;
657 printf("Fixing '..' of inode %lu to be %lu...\n", ino
, parent
);
660 clear_problem_context(&pctx
);
662 if (e2fsck_dir_will_be_rehashed(ctx
, ino
))
663 ctx
->fs
->flags
|= EXT2_FLAG_IGNORE_CSUM_ERRORS
;
664 retval
= ext2fs_dir_iterate(fs
, ino
, DIRENT_FLAG_INCLUDE_EMPTY
,
665 0, fix_dotdot_proc
, &fp
);
666 if (e2fsck_dir_will_be_rehashed(ctx
, ino
))
667 ctx
->fs
->flags
&= ~EXT2_FLAG_IGNORE_CSUM_ERRORS
;
668 if (retval
|| !fp
.done
) {
669 pctx
.errcode
= retval
;
670 fix_problem(ctx
, retval
? PR_3_FIX_PARENT_ERR
:
671 PR_3_FIX_PARENT_NOFIND
, &pctx
);
672 ext2fs_unmark_valid(fs
);
674 (void) e2fsck_dir_info_set_dotdot(ctx
, ino
, parent
);
675 if (e2fsck_dir_info_set_parent(ctx
, ino
, ctx
->lost_and_found
))
676 fix_problem(ctx
, PR_3_NO_DIRINFO
, &pctx
);
682 * These routines are responsible for expanding a /lost+found if it is
686 struct expand_dir_struct
{
688 e2_blkcnt_t guaranteed_size
;
696 static int expand_dir_proc(ext2_filsys fs
,
698 e2_blkcnt_t blockcnt
,
699 blk64_t ref_block
EXT2FS_ATTR((unused
)),
700 int ref_offset
EXT2FS_ATTR((unused
)),
703 struct expand_dir_struct
*es
= (struct expand_dir_struct
*) priv_data
;
705 static blk64_t last_blk
= 0;
712 if (es
->guaranteed_size
&& blockcnt
>= es
->guaranteed_size
)
716 es
->last_block
= blockcnt
;
723 (EXT2FS_B2C(fs
, last_blk
) == EXT2FS_B2C(fs
, last_blk
+ 1)))
724 new_blk
= last_blk
+ 1;
726 last_blk
&= ~EXT2FS_CLUSTER_MASK(fs
);
727 retval
= ext2fs_new_block2(fs
, last_blk
, ctx
->block_found_map
,
734 ext2fs_block_alloc_stats2(fs
, new_blk
, +1);
739 retval
= ext2fs_new_dir_block(fs
, 0, 0, &block
);
745 retval
= ext2fs_write_dir_block4(fs
, new_blk
, block
, 0,
748 retval
= ext2fs_get_mem(fs
->blocksize
, &block
);
753 memset(block
, 0, fs
->blocksize
);
754 retval
= io_channel_write_blk64(fs
->io
, new_blk
, 1, block
);
760 ext2fs_free_mem(&block
);
762 ext2fs_mark_block_bitmap2(ctx
->block_found_map
, new_blk
);
765 return (BLOCK_CHANGED
| BLOCK_ABORT
);
767 return BLOCK_CHANGED
;
771 * Ensure that all blocks are marked in the block_found_map, since it's
772 * possible that the library allocated an extent node block or a block map
773 * block during the directory rebuilding; these new allocations are not
774 * captured in block_found_map. This is bad since we could later use
775 * block_found_map to allocate more blocks.
777 static int find_new_blocks_proc(ext2_filsys fs
,
779 e2_blkcnt_t blockcnt
,
780 blk64_t ref_block
EXT2FS_ATTR((unused
)),
781 int ref_offset
EXT2FS_ATTR((unused
)),
784 struct expand_dir_struct
*es
= (struct expand_dir_struct
*) priv_data
;
785 e2fsck_t ctx
= es
->ctx
;
787 ext2fs_mark_block_bitmap2(ctx
->block_found_map
, *blocknr
);
791 errcode_t
e2fsck_expand_directory(e2fsck_t ctx
, ext2_ino_t dir
,
792 int num
, int guaranteed_size
)
794 ext2_filsys fs
= ctx
->fs
;
796 struct expand_dir_struct es
;
797 struct ext2_inode inode
;
798 blk64_t sz
, before
, after
;
800 if (!(fs
->flags
& EXT2_FLAG_RW
))
801 return EXT2_ET_RO_FILSYS
;
804 * Read the inode and block bitmaps in; we'll be messing with
807 e2fsck_read_bitmaps(ctx
);
809 retval
= ext2fs_check_directory(fs
, dir
);
814 es
.guaranteed_size
= guaranteed_size
;
821 before
= ext2fs_free_blocks_count(fs
->super
);
822 retval
= ext2fs_block_iterate3(fs
, dir
, BLOCK_FLAG_APPEND
,
823 0, expand_dir_proc
, &es
);
827 after
= ext2fs_free_blocks_count(fs
->super
);
830 * If the free block count has dropped by more than the blocks we
831 * allocated ourselves, then we must've allocated some extent/map
832 * blocks. Therefore, we must iterate this dir's blocks again to
833 * ensure that all newly allocated blocks are captured in
836 if ((before
- after
) > es
.newblocks
) {
837 retval
= ext2fs_block_iterate3(fs
, dir
, BLOCK_FLAG_READ_ONLY
,
838 0, find_new_blocks_proc
, &es
);
844 * Update the size and block count fields in the inode.
846 retval
= ext2fs_read_inode(fs
, dir
, &inode
);
850 sz
= (es
.last_block
+ 1) * fs
->blocksize
;
852 inode
.i_size_high
= sz
>> 32;
853 ext2fs_iblk_add_blocks(fs
, &inode
, es
.newblocks
);
854 quota_data_add(ctx
->qctx
, &inode
, dir
, es
.newblocks
* fs
->blocksize
);
856 e2fsck_write_inode(ctx
, dir
, &inode
, "expand_directory");