Skip to content

Commit

Permalink
xfs: put in missed fix for merge problem
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alex Elder committed Oct 18, 2011
1 parent 9508534 commit 2900b33
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion fs/xfs/xfs_trans_ail.c
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ xfsaild_push(

if (!IOP_PUSHBUF(lip)) {
stuck++;
flush_log = 1;
ailp->xa_log_flush++;
} else {
ailp->xa_last_pushed_lsn = lsn;
}
Expand Down

0 comments on commit 2900b33

Please sign in to comment.