diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-09 00:23:33 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-09 00:23:33 -0400 |
| commit | 1ba7055af26f008e8fc8dab9dcb1701534afbe16 (patch) | |
| tree | 6156556f56eba8ebc6d50639fbc8329f5ad078a2 /fs/xfs/xfs_dir2_format.h | |
| parent | f0f6b80368133411414762d1ce42d983ff618c95 (diff) | |
| parent | 317ddd256b9c24b0d78fa8018f80f1e495481a10 (diff) | |
Merge 3.10-rc5 into tty-next
Diffstat (limited to 'fs/xfs/xfs_dir2_format.h')
| -rw-r--r-- | fs/xfs/xfs_dir2_format.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/xfs/xfs_dir2_format.h b/fs/xfs/xfs_dir2_format.h index a3b1bd841a80..995f1f505a52 100644 --- a/fs/xfs/xfs_dir2_format.h +++ b/fs/xfs/xfs_dir2_format.h | |||
| @@ -715,6 +715,7 @@ struct xfs_dir3_free_hdr { | |||
| 715 | __be32 firstdb; /* db of first entry */ | 715 | __be32 firstdb; /* db of first entry */ |
| 716 | __be32 nvalid; /* count of valid entries */ | 716 | __be32 nvalid; /* count of valid entries */ |
| 717 | __be32 nused; /* count of used entries */ | 717 | __be32 nused; /* count of used entries */ |
| 718 | __be32 pad; /* 64 bit alignment. */ | ||
| 718 | }; | 719 | }; |
| 719 | 720 | ||
| 720 | struct xfs_dir3_free { | 721 | struct xfs_dir3_free { |