X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=debugfs%2Flsdel.c;h=c0d589007f4a5d912177490860f853943164e80e;hb=2faf75d24161a7d2d682985812bb9f8f2faea323;hp=6100434033e17c922e5f621d5901587c8536d8ac;hpb=89e25cfdbf206d6840dc92385ee839dd850294db;p=tools%2Fe2fsprogs.git diff --git a/debugfs/lsdel.c b/debugfs/lsdel.c index 6100434..c0d5890 100644 --- a/debugfs/lsdel.c +++ b/debugfs/lsdel.c @@ -1,10 +1,12 @@ /* - * undelete.c --- routines to try to help a user recover a deleted file. - * - * Copyright (C) 1994 Theodore Ts'o. This file may be redistributed - * under the terms of the GNU Public License. + * lsdel.c --- routines to try to help a user recover a deleted file. + * + * Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 + * Theodore Ts'o. This file may be redistributed under the terms of + * the GNU Public License. */ +#include "config.h" #include #include #include @@ -22,18 +24,18 @@ struct deleted_info { ext2_ino_t ino; unsigned short mode; - unsigned short uid; + __u32 uid; __u64 size; time_t dtime; - int num_blocks; - int free_blocks; + e2_blkcnt_t num_blocks; + e2_blkcnt_t free_blocks; }; struct lsdel_struct { ext2_ino_t inode; - int num_blocks; - int free_blocks; - int bad_blocks; + e2_blkcnt_t num_blocks; + e2_blkcnt_t free_blocks; + e2_blkcnt_t bad_blocks; }; static int deleted_info_compare(const void *a, const void *b) @@ -47,8 +49,10 @@ static int deleted_info_compare(const void *a, const void *b) } static int lsdel_proc(ext2_filsys fs, - blk_t *block_nr, - int blockcnt, + blk64_t *block_nr, + e2_blkcnt_t blockcnt EXT2FS_ATTR((unused)), + blk64_t ref_block EXT2FS_ATTR((unused)), + int ref_offset EXT2FS_ATTR((unused)), void *private) { struct lsdel_struct *lsd = (struct lsdel_struct *) private; @@ -56,18 +60,19 @@ static int lsdel_proc(ext2_filsys fs, lsd->num_blocks++; if (*block_nr < fs->super->s_first_data_block || - *block_nr >= fs->super->s_blocks_count) { + *block_nr >= ext2fs_blocks_count(fs->super)) { lsd->bad_blocks++; return BLOCK_ABORT; } - if (!ext2fs_test_block_bitmap(fs->block_map,*block_nr)) + if (!ext2fs_test_block_bitmap2(fs->block_map,*block_nr)) lsd->free_blocks++; return 0; } -void do_lsdel(int argc, char **argv) +void do_lsdel(int argc, char **argv, int sci_idx EXT2FS_ATTR((unused)), + void *infop EXT2FS_ATTR((unused))) { struct lsdel_struct lsd; struct deleted_info *delarray; @@ -78,14 +83,24 @@ void do_lsdel(int argc, char **argv) errcode_t retval; char *block_buf; int i; - - if (argc > 1) { - com_err(argv[0], 0, "Usage: ls_deleted_inodes\n"); + long secs = 0; + char *tmp; + time_t now; + FILE *out; + + if (common_args_process(argc, argv, 1, 2, "list_deleted_inodes", + "[secs]", 0)) return; + + if (argc > 1) { + secs = strtol(argv[1],&tmp,0); + if (*tmp) { + com_err(argv[0], 0, "Bad time - %s",argv[1]); + return; + } } - if (check_fs_open(argv[0])) - return; + now = current_fs->now ? current_fs->now : time(0); max_delarray = 100; num_delarray = 0; delarray = malloc(max_delarray * sizeof(struct deleted_info)); @@ -116,24 +131,30 @@ void do_lsdel(int argc, char **argv) "while starting inode scan"); goto error_out; } - + while (ino) { - if (inode.i_dtime == 0) + if ((inode.i_dtime == 0) || + (secs && (labs(now - secs) > (long) inode.i_dtime))) goto next; lsd.inode = ino; lsd.num_blocks = 0; lsd.free_blocks = 0; lsd.bad_blocks = 0; - - retval = ext2fs_block_iterate(current_fs, ino, 0, block_buf, - lsdel_proc, &lsd); - if (retval) { - com_err("ls_deleted_inodes", retval, - "while calling ext2fs_block_iterate"); - goto next; + + if (ext2fs_inode_has_valid_blocks2(current_fs, &inode)) { + retval = ext2fs_block_iterate3(current_fs, ino, + BLOCK_FLAG_READ_ONLY, + block_buf, + lsdel_proc, &lsd); + if (retval) { + com_err("ls_deleted_inodes", retval, + "while calling ext2fs_block_iterate2"); + goto next; + } } - if (lsd.free_blocks && !lsd.bad_blocks) { + if ((lsd.free_blocks && !lsd.bad_blocks) || + inode.i_flags & EXT4_INLINE_DATA_FL) { if (num_delarray >= max_delarray) { max_delarray += 50; delarray = realloc(delarray, @@ -145,20 +166,17 @@ void do_lsdel(int argc, char **argv) exit(1); } } - + delarray[num_delarray].ino = ino; delarray[num_delarray].mode = inode.i_mode; - delarray[num_delarray].uid = inode.i_uid; - delarray[num_delarray].size = inode.i_size; - if (!LINUX_S_ISDIR(inode.i_mode)) - delarray[num_delarray].size |= - ((__u64) inode.i_size_high << 32); - delarray[num_delarray].dtime = inode.i_dtime; + delarray[num_delarray].uid = inode_uid(inode); + delarray[num_delarray].size = EXT2_I_SIZE(&inode); + delarray[num_delarray].dtime = (__s32) inode.i_dtime; delarray[num_delarray].num_blocks = lsd.num_blocks; delarray[num_delarray].free_blocks = lsd.free_blocks; num_delarray++; } - + next: do { retval = ext2fs_get_next_inode(scan, &ino, &inode); @@ -170,19 +188,23 @@ void do_lsdel(int argc, char **argv) } } - printf("%d deleted inodes found.\n", num_delarray); - printf(" Inode Owner Mode Size Blocks Time deleted\n"); - + out = open_pager(); + + fprintf(out, " Inode Owner Mode Size Blocks Time deleted\n"); + qsort(delarray, num_delarray, sizeof(struct deleted_info), deleted_info_compare); - + for (i = 0; i < num_delarray; i++) { - printf("%6u %6d %6o %6llu %4d/%4d %s", delarray[i].ino, - delarray[i].uid, delarray[i].mode, delarray[i].size, - delarray[i].free_blocks, delarray[i].num_blocks, - time_to_string(delarray[i].dtime)); + fprintf(out, "%6u %6d %6o %6llu %6lld/%6lld %s", + delarray[i].ino, + delarray[i].uid, delarray[i].mode, delarray[i].size, + delarray[i].free_blocks, delarray[i].num_blocks, + time_to_string(delarray[i].dtime)); } - + fprintf(out, "%d deleted inodes found.\n", num_delarray); + close_pager(out); + error_out: free(block_buf); free(delarray);