diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-15 11:40:24 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-15 11:40:24 -0400 |
| commit | a0b3447fb1d8b32071f473c779a482277816867a (patch) | |
| tree | 6b2251c94d791bb2e2331fff362640095637a8f9 /fs | |
| parent | 4cb5aa1d01c9794623df6a2320dcd6398cbe5e8e (diff) | |
| parent | 1c8007b0769d37aa5fcb343b383b0af89ade2f71 (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')
| -rw-r--r-- | fs/jfs/jfs_umount.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/jfs/jfs_umount.c b/fs/jfs/jfs_umount.c index adcf92d3b603..7971f37534a3 100644 --- a/fs/jfs/jfs_umount.c +++ b/fs/jfs/jfs_umount.c | |||
| @@ -68,7 +68,7 @@ int jfs_umount(struct super_block *sb) | |||
| 68 | /* | 68 | /* |
| 69 | * Wait for outstanding transactions to be written to log: | 69 | * Wait for outstanding transactions to be written to log: |
| 70 | */ | 70 | */ |
| 71 | jfs_flush_journal(log, 1); | 71 | jfs_flush_journal(log, 2); |
| 72 | 72 | ||
| 73 | /* | 73 | /* |
| 74 | * close fileset inode allocation map (aka fileset inode) | 74 | * close fileset inode allocation map (aka fileset inode) |
| @@ -146,7 +146,7 @@ int jfs_umount_rw(struct super_block *sb) | |||
| 146 | * | 146 | * |
| 147 | * remove file system from log active file system list. | 147 | * remove file system from log active file system list. |
| 148 | */ | 148 | */ |
| 149 | jfs_flush_journal(log, 1); | 149 | jfs_flush_journal(log, 2); |
| 150 | 150 | ||
| 151 | /* | 151 | /* |
| 152 | * Make sure all metadata makes it to disk | 152 | * Make sure all metadata makes it to disk |