diff options
| author | Alex Elder <aelder@sgi.com> | 2011-10-18 20:00:14 +0000 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2011-10-18 20:00:14 +0000 |
| commit | 2900b33999e2fc8a8edf0dddaafffec4da25ee10 (patch) | |
| tree | b6013dafbf461ee6a0ec4f0f554c02e26877b41a /fs/xfs | |
| parent | 9508534c5f170ada5a745cde0df49732718440e9 (diff) | |
| download | linux-3.10-2900b33999e2fc8a8edf0dddaafffec4da25ee10.tar.gz linux-3.10-2900b33999e2fc8a8edf0dddaafffec4da25ee10.tar.bz2 linux-3.10-2900b33999e2fc8a8edf0dddaafffec4da25ee10.zip | |
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>
Diffstat (limited to 'fs/xfs')
| -rw-r--r-- | fs/xfs/xfs_trans_ail.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_trans_ail.c b/fs/xfs/xfs_trans_ail.c index 512ff646d01..4e3f9bbe014 100644 --- 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; } |