From f51e66cccdceaaaea8112563a2728f29b610d49d Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Fri, 8 Jul 2011 14:35:50 +0200
Subject: [PATCH] --- yaml --- r: 255138 b: refs/heads/master c:
 3ed8638f8867b4d0df1ec606231a087ff06c4a59 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/fs/xfs/xfs_dir2_data.h | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index a1aa54acd4bf..a64054be8076 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ba9cd84ef2af58645333a86f9c901684ab1fef6
+refs/heads/master: 3ed8638f8867b4d0df1ec606231a087ff06c4a59
diff --git a/trunk/fs/xfs/xfs_dir2_data.h b/trunk/fs/xfs/xfs_dir2_data.h
index ca02cc71e234..c50512584ebf 100644
--- a/trunk/fs/xfs/xfs_dir2_data.h
+++ b/trunk/fs/xfs/xfs_dir2_data.h
@@ -98,14 +98,15 @@ typedef struct xfs_dir2_data_hdr {
 
 /*
  * Active entry in a data block.  Aligned to 8 bytes.
- * Tag appears as the last 2 bytes.
+ *
+ * After the variable length name field there is a 2 byte tag field, which
+ * can be accessed using xfs_dir2_data_entry_tag_p.
  */
 typedef struct xfs_dir2_data_entry {
 	__be64			inumber;	/* inode number */
 	__u8			namelen;	/* name length */
-	__u8			name[1];	/* name bytes, no null */
-						/* variable offset */
-	__be16			tag;		/* starting offset of us */
+	__u8			name[];		/* name bytes, no null */
+     /*	__be16                  tag; */		/* starting offset of us */
 } xfs_dir2_data_entry_t;
 
 /*