summaryrefslogtreecommitdiffstats
path: root/fs/xfs
diff options
context:
space:
mode:
authorDarrick J. Wong2016-08-03 02:59:42 +0200
committerDave Chinner2016-08-03 02:59:42 +0200
commit3dadf901ddc0a1275b622b1a170557bd0d136862 (patch)
tree955cef453c7414ac5aace301f174afbc1fc2bb6d /fs/xfs
parentxfs: in _attrlist_by_handle, copy the cursor back to userspace (diff)
downloadkernel-qcow2-linux-3dadf901ddc0a1275b622b1a170557bd0d136862.tar.gz
kernel-qcow2-linux-3dadf901ddc0a1275b622b1a170557bd0d136862.tar.xz
kernel-qcow2-linux-3dadf901ddc0a1275b622b1a170557bd0d136862.zip
xfs: fix attr shortform structure alignment on cris
Apparently cris doesn't require structure stride to align with the largest type in the struct, so list[0] isn't at offset 4 like it is everywhere else. Fix this... insofar as existing XFSes on cris are screwed. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Brian Foster <bfoster@redhat.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Dave Chinner <david@fromorbit.com>
Diffstat (limited to 'fs/xfs')
-rw-r--r--fs/xfs/libxfs/xfs_da_format.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/xfs/libxfs/xfs_da_format.h b/fs/xfs/libxfs/xfs_da_format.h
index 685f23b67056..9a492a9e19bd 100644
--- a/fs/xfs/libxfs/xfs_da_format.h
+++ b/fs/xfs/libxfs/xfs_da_format.h
@@ -629,6 +629,7 @@ typedef struct xfs_attr_shortform {
struct xfs_attr_sf_hdr { /* constant-structure header block */
__be16 totsize; /* total bytes in shortform list */
__u8 count; /* count of active entries */
+ __u8 padding;
} hdr;
struct xfs_attr_sf_entry {
__uint8_t namelen; /* actual length of name (no NULL) */