From 133e94627b01823d2555450ddd1d95401ff2227a Mon Sep 17 00:00:00 2001 From: Zheng Liu Date: Mon, 3 Mar 2014 00:31:26 -0500 Subject: [PATCH] debugfs: make stat command support inline data If there is an inode with inline data, we just print the size of inline data in stat command. Signed-off-by: Zheng Liu Signed-off-by: "Theodore Ts'o" --- debugfs/debugfs.c | 12 ++++++++++++ lib/ext2fs/ext2fsP.h | 2 ++ lib/ext2fs/inline_data.c | 22 ++++++++++++++++++++++ 3 files changed, 36 insertions(+) diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c index 29c0161..d1ecf2e 100644 --- a/debugfs/debugfs.c +++ b/debugfs/debugfs.c @@ -731,6 +731,16 @@ static void dump_extents(FILE *f, const char *prefix, ext2_ino_t ino, fprintf(f, "\n"); } +static void dump_inline_data(FILE *out, const char *prefix, ext2_ino_t inode_num) +{ + errcode_t retval; + size_t size; + + retval = ext2fs_inline_data_size(current_fs, inode_num, &size); + if (!retval) + fprintf(out, "%sSize of inline data: %d", prefix, size); +} + void internal_dump_inode(FILE *out, const char *prefix, ext2_ino_t inode_num, struct ext2_inode *inode, int do_dump_blocks) @@ -865,6 +875,8 @@ void internal_dump_inode(FILE *out, const char *prefix, if (inode->i_flags & EXT4_EXTENTS_FL) dump_extents(out, prefix, inode_num, DUMP_LEAF_EXTENTS|DUMP_NODE_EXTENTS, 0, 0); + else if (inode->i_flags & EXT4_INLINE_DATA_FL) + dump_inline_data(out, prefix, inode_num); else dump_blocks(out, prefix, inode_num); } diff --git a/lib/ext2fs/ext2fsP.h b/lib/ext2fs/ext2fsP.h index b2afd15..696603a 100644 --- a/lib/ext2fs/ext2fsP.h +++ b/lib/ext2fs/ext2fsP.h @@ -88,6 +88,8 @@ extern int ext2fs_process_dir_block(ext2_filsys fs, int ref_offset, void *priv_data); +extern errcode_t ext2fs_inline_data_size(ext2_filsys fs, ext2_ino_t ino, + size_t *size); extern int ext2fs_inline_data_dir_iterate(ext2_filsys fs, ext2_ino_t ino, void *priv_data); diff --git a/lib/ext2fs/inline_data.c b/lib/ext2fs/inline_data.c index 9bfc8ef..a9b6681 100644 --- a/lib/ext2fs/inline_data.c +++ b/lib/ext2fs/inline_data.c @@ -77,6 +77,28 @@ err: return retval; } +errcode_t ext2fs_inline_data_size(ext2_filsys fs, ext2_ino_t ino, size_t *size) +{ + struct ext2_inode inode; + struct ext2_inline_data data; + errcode_t retval; + + retval = ext2fs_read_inode(fs, ino, &inode); + if (retval) + return retval; + + if (!(inode.i_flags & EXT4_INLINE_DATA_FL)) + return EXT2_ET_NO_INLINE_DATA; + + data.fs = fs; + data.ino = ino; + retval = ext2fs_inline_data_ea_get(&data); + if (retval) + return retval; + + *size = EXT4_MIN_INLINE_DATA_SIZE + data.ea_size; + return ext2fs_free_mem(&data.ea_data); +} int ext2fs_inline_data_dir_iterate(ext2_filsys fs, ext2_ino_t ino, void *priv_data) -- 1.8.3.1