aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-03 08:47:15 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-03 08:47:15 -0800
commitc1c0cbb8781e4b684a3d902d05b01912b3a545d9 (patch)
treea68d6890ff27162bbb4e6251cf66ad97995abfd4
parentc80d292f137275a1ed88e6ed515ecb457051f1a4 (diff)
parent3256a05531b1164a9c138da701b922a113bddf82 (diff)
downloadmrst-s0i3-test-c1c0cbb8781e4b684a3d902d05b01912b3a545d9.tar.gz
mrst-s0i3-test-c1c0cbb8781e4b684a3d902d05b01912b3a545d9.tar.xz
mrst-s0i3-test-c1c0cbb8781e4b684a3d902d05b01912b3a545d9.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2: nilfs2: fix potential leak of dirty data on umount
-rw-r--r--fs/nilfs2/segment.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c
index 17584c52448..105b508b47a 100644
--- a/fs/nilfs2/segment.c
+++ b/fs/nilfs2/segment.c
@@ -2829,7 +2829,7 @@ static void nilfs_segctor_destroy(struct nilfs_sc_info *sci)
|| sci->sc_seq_request != sci->sc_seq_done);
spin_unlock(&sci->sc_state_lock);
- if (flag || nilfs_segctor_confirm(sci))
+ if (flag || !nilfs_segctor_confirm(sci))
nilfs_segctor_write_out(sci);
WARN_ON(!list_empty(&sci->sc_copied_buffers));