diff options
| author | Alex Elder <aelder@sgi.com> | 2010-03-05 12:45:03 -0500 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2010-03-05 12:45:03 -0500 |
| commit | 9b1f56d60acfd634728f91f34922066c6f80ede6 (patch) | |
| tree | e8f64d4bea808341f56f41e724c2920ae6b1ed26 /fs/xfs/xfs_fs.h | |
| parent | 64ba9926759792cf7b95f823402e2781edd1b5d4 (diff) | |
| parent | 07000ee686cf19e853fa06f7904eff2cfe230ea3 (diff) | |
Merge branch 'for-2.6.34-rc1-batch2' into for-linus
Diffstat (limited to 'fs/xfs/xfs_fs.h')
| -rw-r--r-- | fs/xfs/xfs_fs.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/xfs/xfs_fs.h b/fs/xfs/xfs_fs.h index f52ac276277e..7cf7220e7d5f 100644 --- a/fs/xfs/xfs_fs.h +++ b/fs/xfs/xfs_fs.h | |||
| @@ -292,7 +292,8 @@ typedef struct xfs_bstat { | |||
| 292 | __s32 bs_extents; /* number of extents */ | 292 | __s32 bs_extents; /* number of extents */ |
| 293 | __u32 bs_gen; /* generation count */ | 293 | __u32 bs_gen; /* generation count */ |
| 294 | __u16 bs_projid; /* project id */ | 294 | __u16 bs_projid; /* project id */ |
| 295 | unsigned char bs_pad[14]; /* pad space, unused */ | 295 | __u16 bs_forkoff; /* inode fork offset in bytes */ |
| 296 | unsigned char bs_pad[12]; /* pad space, unused */ | ||
| 296 | __u32 bs_dmevmask; /* DMIG event mask */ | 297 | __u32 bs_dmevmask; /* DMIG event mask */ |
| 297 | __u16 bs_dmstate; /* DMIG state info */ | 298 | __u16 bs_dmstate; /* DMIG state info */ |
| 298 | __u16 bs_aextents; /* attribute number of extents */ | 299 | __u16 bs_aextents; /* attribute number of extents */ |