e2fsck: add support for xattrs in external inodes

[tools/e2fsprogs.git] / debugfs / debugfs.c

diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
index cf80bd0..36243f6 100644 (file)
--- a/debugfs/debugfs.c
+++ b/debugfs/debugfs.c
@@ -520,6 +520,7 @@ static void internal_dump_inode_extra(FILE *out,
        struct ext2_ext_attr_entry *entry;
        __u32 *magic;
        char *start, *end;
+       int inode_xattr;
        unsigned int storage_size;
 
        fprintf(out, "Size of extra inode fields: %u\n", inode->i_extra_isize);
@@ -542,17 +543,28 @@ static void internal_dump_inode_extra(FILE *out,
                while (!EXT2_EXT_IS_LAST_ENTRY(entry)) {
                        struct ext2_ext_attr_entry *next =
                                EXT2_EXT_ATTR_NEXT(entry);
-                       if (entry->e_value_size > storage_size ||
-                                       (char *) next >= end) {
+                       inode_xattr =
+                               EXT2_HAS_INCOMPAT_FEATURE(current_fs->super,
+                                       EXT4_FEATURE_INCOMPAT_EA_INODE) &&
+                                       entry->e_value_offs == 0 &&
+                                       entry->e_value_inum != 0;
+                       if ((entry->e_value_size > storage_size &&
+                            !inode_xattr) || (char *)next >= end) {
                                fprintf(out, "invalid EA entry in inode\n");
                                return;
                        }
                        fprintf(out, "  ");
+
                        dump_xattr_string(out, EXT2_EXT_ATTR_NAME(entry),
                                          entry->e_name_len);
                        fprintf(out, " = \"");
-                       dump_xattr_string(out, start + entry->e_value_offs,
-                                               entry->e_value_size);
+                       if (inode_xattr)
+                               fprintf(out, "inode <%u>",
+                                       entry->e_value_inum);
+                       else
+                               dump_xattr_string(out,
+                                                 start + entry->e_value_offs,
+                                                 entry->e_value_size);
                        fprintf(out, "\" (%u)\n", entry->e_value_size);
                        entry = next;
                }