diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-14 19:16:31 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-14 19:16:31 -1000 |
| commit | d58c6ff0b779c5adae2a8596fde69cb45f2a5d68 (patch) | |
| tree | 430cfaafb27865d98e09e77f432ac0077976972c /fs/xfs/xfs_attr_leaf.h | |
| parent | 9bb92855e3491e3f84a1477f14810f7c59fdbc73 (diff) | |
| parent | d302cf1d316dca5f567e89872cf5d475c9a55f74 (diff) | |
Merge tag 'for-linus-v3.10-rc6' of git://oss.sgi.com/xfs/xfs
Pull xfs fixes from Ben Myers:
- Remove noisy warnings about experimental support which spams the logs
- Add padding to align directory and attr structures correctly
- Set block number on child buffer on a root btree split
- Disable verifiers during log recovery for non-CRC filesystems
* tag 'for-linus-v3.10-rc6' of git://oss.sgi.com/xfs/xfs:
xfs: don't shutdown log recovery on validation errors
xfs: ensure btree root split sets blkno correctly
xfs: fix implicit padding in directory and attr CRC formats
xfs: don't emit v5 superblock warnings on write
Diffstat (limited to 'fs/xfs/xfs_attr_leaf.h')
| -rw-r--r-- | fs/xfs/xfs_attr_leaf.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/xfs/xfs_attr_leaf.h b/fs/xfs/xfs_attr_leaf.h index f9d7846097e2..444a7704596c 100644 --- a/fs/xfs/xfs_attr_leaf.h +++ b/fs/xfs/xfs_attr_leaf.h @@ -128,6 +128,7 @@ struct xfs_attr3_leaf_hdr { __u8 holes; __u8 pad1; struct xfs_attr_leaf_map freemap[XFS_ATTR_LEAF_MAPSIZE]; + __be32 pad2; /* 64 bit alignment */ }; #define XFS_ATTR3_LEAF_CRC_OFF (offsetof(struct xfs_attr3_leaf_hdr, info.crc)) |