aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Elder <aelder@sgi.com>2011-10-18 16:00:14 -0400
committerAlex Elder <aelder@sgi.com>2011-10-18 16:00:14 -0400
commit2900b33999e2fc8a8edf0dddaafffec4da25ee10 (patch)
treeb6013dafbf461ee6a0ec4f0f554c02e26877b41a
parent9508534c5f170ada5a745cde0df49732718440e9 (diff)
xfs: put in missed fix for merge problem
I intended to do this as part of fixing part of the conflict with the merge with Linus' tree, but evidently it didn't get included in the commit. Signed-off-by: Alex Elder <aelder@sgi.com> Reviewed-by: Christoph Hellwig <hch@lst.de>
-rw-r--r--fs/xfs/xfs_trans_ail.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_trans_ail.c b/fs/xfs/xfs_trans_ail.c
index 512ff646d01c..4e3f9bbe0141 100644
--- a/fs/xfs/xfs_trans_ail.c
+++ b/fs/xfs/xfs_trans_ail.c
@@ -434,7 +434,7 @@ xfsaild_push(
434 434
435 if (!IOP_PUSHBUF(lip)) { 435 if (!IOP_PUSHBUF(lip)) {
436 stuck++; 436 stuck++;
437 flush_log = 1; 437 ailp->xa_log_flush++;
438 } else { 438 } else {
439 ailp->xa_last_pushed_lsn = lsn; 439 ailp->xa_last_pushed_lsn = lsn;
440 } 440 }