diff options
| author | Alex Elder <aelder@sgi.com> | 2011-10-17 22:42:02 +0200 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2011-10-17 22:42:02 +0200 |
| commit | 9508534c5f170ada5a745cde0df49732718440e9 (patch) | |
| tree | 2b0f1e19aa529e77720522d13541adedbc46564e /fs/hpfs/map.c | |
| parent | xfs: do not flush data workqueues in xfs_flush_buftarg (diff) | |
| parent | Avoid using variable-length arrays in kernel/sys.c (diff) | |
| download | linux-9508534c5f170ada5a745cde0df49732718440e9.tar.xz linux-9508534c5f170ada5a745cde0df49732718440e9.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Resolved conflicts:
fs/xfs/xfs_trans_priv.h:
- deleted struct xfs_ail field xa_flags
- kept field xa_log_flush in struct xfs_ail
fs/xfs/xfs_trans_ail.c:
- in xfsaild_push(), in XFS_ITEM_PUSHBUF case, replaced
"flush_log = 1" with "ailp->xa_log_flush++"
Signed-off-by: Alex Elder <aelder@sgi.com>
Diffstat (limited to 'fs/hpfs/map.c')
0 files changed, 0 insertions, 0 deletions