diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-17 01:19:54 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-17 01:19:54 +0100 |
| commit | dfdebc24837ed0a1d6ad73b108a10d3c88d1b6e8 (patch) | |
| tree | 80a0af3d940ca160dff0fc338ce6777a5b7058e1 /fs/xfs/xfs_buf_item.h | |
| parent | Merge tag 'pm+acpi-for-3.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | xfs: recalculate leaf entry pointer after compacting a dir2 block (diff) | |
| download | linux-dfdebc24837ed0a1d6ad73b108a10d3c88d1b6e8.tar.xz linux-dfdebc24837ed0a1d6ad73b108a10d3c88d1b6e8.zip | |
Merge tag 'for-linus-v3.8-rc4' of git://oss.sgi.com/xfs/xfs
Pull xfs bugfixes from Ben Myers:
- fix(es) for compound buffers
- fix for dquot soft timer asserts due to overflow of d_blk_softlimit
- fix for regression in dir v2 code introduced in commit 20f7e9f3726a
("xfs: factor dir2 block read operations")
* tag 'for-linus-v3.8-rc4' of git://oss.sgi.com/xfs/xfs:
xfs: recalculate leaf entry pointer after compacting a dir2 block
xfs: remove int casts from debug dquot soft limit timer asserts
xfs: fix the multi-segment log buffer format
xfs: fix segment in xfs_buf_item_format_segment
xfs: rename bli_format to avoid confusion with bli_formats
xfs: use b_maps[] for discontiguous buffers
Diffstat (limited to 'fs/xfs/xfs_buf_item.h')
| -rw-r--r-- | fs/xfs/xfs_buf_item.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_buf_item.h b/fs/xfs/xfs_buf_item.h index 6850f49f4af3..16def435944a 100644 --- a/fs/xfs/xfs_buf_item.h +++ b/fs/xfs/xfs_buf_item.h @@ -104,7 +104,7 @@ typedef struct xfs_buf_log_item { #endif int bli_format_count; /* count of headers */ struct xfs_buf_log_format *bli_formats; /* array of in-log header ptrs */ - struct xfs_buf_log_format bli_format; /* embedded in-log header */ + struct xfs_buf_log_format __bli_format; /* embedded in-log header */ } xfs_buf_log_item_t; void xfs_buf_item_init(struct xfs_buf *, struct xfs_mount *); |