Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0b3447f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 4cb5aa1d 1c8007b0

fs/jfs/jfs_umount.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -68,7 +68,7 @@ int jfs_umount(struct super_block *sb) 
		/*

		/*

		 * Wait for outstanding transactions to be written to log:

		 * 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)

	 * 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.

	 * 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

	 * Make sure all metadata makes it to disk