projects
/
deliverable
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9508534
)
xfs: put in missed fix for merge problem
author
Alex Elder
<aelder@sgi.com>
Tue, 18 Oct 2011 20:00:14 +0000
(20:00 +0000)
committer
Alex Elder
<aelder@sgi.com>
Tue, 18 Oct 2011 20:00:14 +0000
(20:00 +0000)
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>
fs/xfs/xfs_trans_ail.c
patch
|
blob
|
blame
|
history
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;
}
This page took
0.025247 seconds
and
5
git commands to generate.