debugfs: dump "fid" and "lma" xattrs on inode stat

Print out the Lustre "fid" and "lma" object xattr contents,
if present, with debugfs stat to simplify debugging.

Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>

diff --git a/debugfs/Makefile.in b/debugfs/Makefile.in
index 3dd06f0..c036331 100644 (file)
--- a/debugfs/Makefile.in
+++ b/debugfs/Makefile.in
@@ -43,6 +43,8 @@ STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(DEPSTATIC_LIBSS) \
                $(DEPSTATIC_LIBCOM_ERR) $(DEPSTATIC_LIBUUID) \
                $(DEPSTATIC_LIBE2P)
 
+@LFSCK_CMT@LUSTRE_INC=-I @LUSTRE@/lustre/include -I @LUSTRE@/include -I @LUSTRE@/libcfs/include -Wall
+
 .c.o:
        $(E) "  CC $<"
        $(Q) $(CC) -c $(ALL_CFLAGS) $< -o $@

diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
index 5baa93c..c8eff77 100644 (file)
--- a/debugfs/debugfs.c
+++ b/debugfs/debugfs.c
@@ -36,6 +36,7 @@ extern char *optarg;
 
 #include "../version.h"
 #include "jfs_user.h"
+#include "ext2fs/lfsck.h"
 
 #ifndef BUFSIZ
 #define BUFSIZ 8192
@@ -527,9 +528,55 @@ static void dump_xattr_string(FILE *out, const char *str, int len)
                        fprintf(out, "%02x ", (unsigned char)str[i]);
 }
 
+
+static void print_fidstr(FILE *out, ext2_ino_t inode_num, void *data, int len)
+{
+       struct filter_fid_old *ff = data;
+       int stripe;
+
+       /* Since Lustre 2.4 only the parent FID is stored in filter_fid,
+        * and the self fid is stored in the LMA and is printed below. */
+       if (len < sizeof(ff->ff_parent)) {
+               fprintf(stderr, "%s: error: filter_fid for inode %u smaller "
+                       "than expected (%d bytes).\n",
+                       debug_prog_name, inode_num, len);
+               return;
+       }
+       fid_le_to_cpu(&ff->ff_parent, &ff->ff_parent);
+       stripe = fid_ver(&ff->ff_parent); /* stripe index is stored in f_ver */
+       ff->ff_parent.f_ver = 0;
+
+       fprintf(out, "  fid: ");
+       /* Old larger filter_fid should only ever be used with seq = 0.
+        * FID-on-OST should use LMA for FID_SEQ_NORMAL OST objects. */
+       if (len > sizeof(ff->ff_parent))
+               fprintf(out, "objid=%llu seq=%llu ",
+                       ext2fs_le64_to_cpu(ff->ff_objid),
+                       ext2fs_le64_to_cpu(ff->ff_seq));
+
+       fprintf(out, "parent="DFID" stripe=%u\n", PFID(&ff->ff_parent), stripe);
+}
+
+static void print_lmastr(FILE *out, ext2_ino_t inode_num, void *data, int len)
+{
+       struct lustre_mdt_attrs *lma = data;
+
+       if (len < offsetof(typeof(*lma), lma_self_fid) +
+                 sizeof(lma->lma_self_fid)) {
+               fprintf(stderr, "%s: error: LMA for inode %u smaller than "
+                       "expected (%d bytes).\n",
+                       debug_prog_name, inode_num, len);
+               return;
+       }
+       fid_le_to_cpu(&lma->lma_self_fid, &lma->lma_self_fid);
+       fprintf(out, "  lma: fid="DFID" compat=%x incompat=%x\n",
+               PFID(&lma->lma_self_fid), ext2fs_le32_to_cpu(lma->lma_compat),
+               ext2fs_le32_to_cpu(lma->lma_incompat));
+}
+
 static void internal_dump_inode_extra(FILE *out,
                                      const char *prefix EXT2FS_ATTR((unused)),
-                                     ext2_ino_t inode_num EXT2FS_ATTR((unused)),
+                                     ext2_ino_t inode_num,
                                      struct ext2_inode_large *inode)
 {
        struct ext2_ext_attr_entry *entry;
@@ -577,6 +624,24 @@ static void internal_dump_inode_extra(FILE *out,
                                dump_xattr_string(out, value,
                                                  entry->e_value_size);
                        fprintf(out, "\" (%u)\n", entry->e_value_size);
+
+                       /* Special decoding for Lustre filter-fid */
+                       if ((entry->e_name_index == EXT2_ATTR_INDEX_TRUSTED ||
+                            entry->e_name_index == EXT2_ATTR_INDEX_LUSTRE) &&
+                           !strncmp(EXT2_EXT_ATTR_NAME(entry),
+                                    LUSTRE_XATTR_OST_FID, entry->e_name_len))
+                               print_fidstr(out, inode_num,
+                                            start + entry->e_value_offs,
+                                            entry->e_value_size);
+                       /* Special decoding for Lustre lma */
+                       if ((entry->e_name_index == EXT2_ATTR_INDEX_TRUSTED ||
+                            entry->e_name_index == EXT2_ATTR_INDEX_LUSTRE) &&
+                           !strncmp(EXT2_EXT_ATTR_NAME(entry),
+                                    LUSTRE_XATTR_MDT_LMA, entry->e_name_len))
+                               print_lmastr(out, inode_num,
+                                            start + entry->e_value_offs,
+                                            entry->e_value_size);
+
                        entry = next;
                }
        }

diff --git a/lib/ext2fs/lfsck.h b/lib/ext2fs/lfsck.h
index 6a49042..3fadd66 100644 (file)
--- a/lib/ext2fs/lfsck.h
+++ b/lib/ext2fs/lfsck.h
@@ -34,6 +34,36 @@ static inline void fid_be_to_cpu(struct lu_fid *dst, struct lu_fid *src)
        dst->f_oid = ext2fs_be32_to_cpu(src->f_oid);
        dst->f_ver = ext2fs_be32_to_cpu(src->f_ver);
 }
+
+static inline void fid_le_to_cpu(struct lu_fid *dst, struct lu_fid *src)
+{
+       dst->f_seq = ext2fs_le64_to_cpu(src->f_seq);
+       dst->f_oid = ext2fs_le32_to_cpu(src->f_oid);
+       dst->f_ver = ext2fs_le32_to_cpu(src->f_ver);
+}
+#endif /* HAVE_LUSTRE_LUSTRE_IDL_H */
+
+#define LUSTRE_XATTR_MDT_LOV   "lov"
+#define LUSTRE_XATTR_MDT_LMA   "lma"
+#define LUSTRE_XATTR_MDT_LINK  "link"
+#define LUSTRE_XATTR_OST_FID   "fid"
+
+#ifndef LMA_OLD_SIZE
+#ifndef LMA_INCOMPAT_SUPP
+struct lustre_mdt_attrs {
+       __u32           lma_compat;
+       __u32           lma_incompat;
+       struct lu_fid   lma_self_fid;
+};
 #endif
 
+struct filter_fid_old {
+       struct lu_fid   ff_parent;
+       __u64           ff_objid;
+       __u64           ff_seq;
+};
+
+#define LMA_OLD_SIZE 64
+#endif /* !LMA_OLD_SIZE */
+
 #endif /* LFSCK_H */