| commit | 9508534c5f170ada5a745cde0df49732718440e9 | [log] [tgz] |
|---|---|---|
| author | Alex Elder <aelder@sgi.com> | Mon Oct 17 15:42:02 2011 -0500 |
| committer | Alex Elder <aelder@sgi.com> | Mon Oct 17 15:42:02 2011 -0500 |
| tree | 2b0f1e19aa529e77720522d13541adedbc46564e | |
| parent | 5a93a064d27b42e4af1772b0599b53e3241191ac [diff] | |
| parent | a84a79e4d369a73c0130b5858199e949432da4c6 [diff] |
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>