From b3267b9f4f9037b84fa83e1296e7dad508a592ba Mon Sep 17 00:00:00 2001 From: c17828 Date: Mon, 10 Dec 2018 11:59:36 +0300 Subject: [PATCH] LU-1365 debugfs: output large directory size Use hight part of directory size in debugfs output. Change-Id: I9d82d72b9bc8b10b9d8c0768911672892aef06e9 Signed-off-by: Artem Blagodarenko Reviewed-on: https://review.whamcloud.com/33814 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger --- debugfs/debugfs.c | 2 +- debugfs/ls.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c index 0b04508..faae12d 100644 --- a/debugfs/debugfs.c +++ b/debugfs/debugfs.c @@ -840,7 +840,7 @@ void internal_dump_inode(FILE *out, const char *prefix, if (is_large_inode && large_inode->i_extra_isize >= 32) fprintf(out, " Project: %5d", large_inode->i_projid); fputs(" Size: ", out); - if (LINUX_S_ISREG(inode->i_mode)) + if (LINUX_S_ISREG(inode->i_mode) || LINUX_S_ISDIR(inode->i_mode)) fprintf(out, "%llu\n", EXT2_I_SIZE(inode)); else fprintf(out, "%d\n", inode->i_size); diff --git a/debugfs/ls.c b/debugfs/ls.c index 2b631f8..c00aa4a 100644 --- a/debugfs/ls.c +++ b/debugfs/ls.c @@ -189,9 +189,6 @@ static int list_dir_proc(ext2_ino_t dir EXT2FS_ATTR((unused)), fprintf(ls->f, "(%d) %5d %5d ", ext2fs_dirent_file_type(dirent), inode_uid(inode), inode_gid(inode)); - if (LINUX_S_ISDIR(inode.i_mode)) - fprintf(ls->f, "%5d", inode.i_size); - else fprintf(ls->f, "%5llu", EXT2_I_SIZE(&inode)); fprintf(ls->f, " %s ", datestr); if ((ls->options & DIRDATA_OPT) != 0) -- 1.8.3.1