/*
* 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 <stdio.h>
#include <unistd.h>
#include <stdlib.h>
}
static int lsdel_proc(ext2_filsys fs,
- blk_t *block_nr,
+ blk64_t *block_nr,
e2_blkcnt_t blockcnt EXT2FS_ATTR((unused)),
- blk_t ref_block EXT2FS_ATTR((unused)),
+ blk64_t ref_block EXT2FS_ATTR((unused)),
int ref_offset EXT2FS_ATTR((unused)),
void *private)
{
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;
char *tmp;
time_t now;
FILE *out;
-
- if (common_args_process(argc, argv, 1, 2, "ls_deleted_inodes",
+
+ if (common_args_process(argc, argv, 1, 2, "list_deleted_inodes",
"[secs]", 0))
return;
"while starting inode scan");
goto error_out;
}
-
+
while (ino) {
if ((inode.i_dtime == 0) ||
- (secs && ((unsigned) abs(now - secs) > inode.i_dtime)))
+ (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_iterate2(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 (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,
exit(1);
}
}
-
+
delarray[num_delarray].ino = ino;
delarray[num_delarray].mode = inode.i_mode;
delarray[num_delarray].uid = inode_uid(inode);
- 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].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);
}
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++) {
- fprintf(out, "%6u %6d %6o %6llu %6lld/%6lld %s",
+ 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,
+ 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);