summaryrefslogtreecommitdiffstats
path: root/fs/jfs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-08-15 08:40:24 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-08-15 08:40:24 -0700
commita0b3447fb1d8b32071f473c779a482277816867a (patch)
tree6b2251c94d791bb2e2331fff362640095637a8f9 /fs/jfs
parent4cb5aa1d01c9794623df6a2320dcd6398cbe5e8e (diff)
parent1c8007b0769d37aa5fcb343b383b0af89ade2f71 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6: jfs: flush journal completely before releasing metadata inodes
Diffstat (limited to 'fs/jfs')
-rw-r--r--fs/jfs/jfs_umount.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/jfs/jfs_umount.c b/fs/jfs/jfs_umount.c
index adcf92d3b60..7971f37534a 100644
--- a/fs/jfs/jfs_umount.c
+++ b/fs/jfs/jfs_umount.c
@@ -68,7 +68,7 @@ int jfs_umount(struct super_block *sb)
/*
* Wait for outstanding transactions to be written to log:
*/
- jfs_flush_journal(log, 1);
+ jfs_flush_journal(log, 2);
/*
* close fileset inode allocation map (aka fileset inode)
@@ -146,7 +146,7 @@ int jfs_umount_rw(struct super_block *sb)
*
* remove file system from log active file system list.
*/
- jfs_flush_journal(log, 1);
+ jfs_flush_journal(log, 2);
/*
* Make sure all metadata makes it to disk