summaryrefslogtreecommitdiffstats
path: root/fs/xfs
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2011-07-08 14:35:50 +0200
committerChristoph Hellwig <hch@lst.de>2011-07-08 14:35:50 +0200
commit3ed8638f8867b4d0df1ec606231a087ff06c4a59 (patch)
tree17afe7f78f2d32e96eb5f7697b9a4db6c5796e7e /fs/xfs
parent0ba9cd84ef2af58645333a86f9c901684ab1fef6 (diff)
downloadlinux-stable-3ed8638f8867b4d0df1ec606231a087ff06c4a59.tar.gz
linux-stable-3ed8638f8867b4d0df1ec606231a087ff06c4a59.tar.bz2
linux-stable-3ed8638f8867b4d0df1ec606231a087ff06c4a59.zip
xfs: cleanup the definition of struct xfs_dir2_data_entry
Remove the tag member which is at a variable offset after the actual name, and make name a real variable sized C99 array instead of the incorrect one-sized array which confuses (not only) gcc. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Alex Elder <aelder@sgi.com> Reviewed-by: Dave Chinner <dchinner@redhat.com>
Diffstat (limited to 'fs/xfs')
-rw-r--r--fs/xfs/xfs_dir2_data.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/xfs/xfs_dir2_data.h b/fs/xfs/xfs_dir2_data.h
index ca02cc71e234..c50512584ebf 100644
--- a/fs/xfs/xfs_dir2_data.h
+++ b/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;
/*