korg/e2fsprogs
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git synced 2024-11-23 18:14:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

debugfs: fix ncheck so it handles hard links correctly

Browse Source 
Due to hard links inodes can have multiple names (except for folders),
ncheck should find all of the names (equal to the number of links to the
inodes, directories excepted), not names to the count of the provided
inodes.

Signed-off-by: Jaco Kroon <jaco@uls.co.za>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Jaco Kroon 2018-08-02 20:06:46 +02:00 committed by Theodore Ts'o
parent 31ee367e97
commit 4a30e2ae7c
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
debugfs/ncheck.c
View File

@ -28,7 +28,7 @@ extern char *optarg;
struct inode_walk_struct {
ext2_ino_t dir;
ext2_ino_t *iarray;
int inodes_left;
int names_left;
int num_inodes;
int position;
char *parent;
@ -81,10 +81,10 @@ static int ncheck_proc(struct ext2_dir_entry *dirent,
}
}
putc('\n', stdout);
iw->inodes_left--;
iw->names_left--;
}
}
if (!iw->inodes_left)
if (!iw->names_left)
return DIRENT_ABORT;
return 0;
@ -131,15 +131,22 @@ void do_ncheck(int argc, char **argv)
}
memset(iw.iarray, 0, sizeof(ext2_ino_t) * argc);
iw.names_left = 0;
for (i=0; i < argc; i++) {
iw.iarray[i] = strtol(argv[i], &tmp, 0);
if (*tmp) {
com_err("ncheck", 0, "Bad inode - %s", argv[i]);
goto error_out;
}
if (debugfs_read_inode(iw.iarray[i], &inode, *argv))
goto error_out;
if (LINUX_S_ISDIR(inode.i_mode))
iw.names_left += 1;
else
iw.names_left += inode.i_links_count;
}
iw.num_inodes = iw.inodes_left = argc;
iw.num_inodes = argc;
retval = ext2fs_open_inode_scan(current_fs, 0, &scan);
if (retval) {
@ -183,7 +190,7 @@ void do_ncheck(int argc, char **argv)
goto next;
}
if (iw.inodes_left == 0)
if (iw.names_left == 0)
break;
next: