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>

diff --git a/fs/xfs/xfs_trans_ail.c b/fs/xfs/xfs_trans_ail.c
index 512ff646d01c979083ce0a577a65d0b23a5af50b..4e3f9bbe01418717b5c2ca28693f568a6d28c77e 100644 (file)
--- a/fs/xfs/xfs_trans_ail.c
+++ b/fs/xfs/xfs_trans_ail.c
@@ -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;
                        }