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

Commit 78d96251 authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

ext4: respect the nobarrier mount option in nojournal mode 



Also, if we are going to issue the barrier, we should do this after we
write out the parent directories if necessary.

Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
parent d08854f5

fs/ext4/fsync.c

+4 −1
Original line number Diff line number Diff line
@@ -106,9 +106,11 @@ int ext4_sync_file(struct file *file, loff_t start, loff_t end, int datasync) 
	}



	if (!journal) {

		ret = generic_file_fsync(file, start, end, datasync);

		ret = __generic_file_fsync(file, start, end, datasync);

		if (!ret && !hlist_empty(&inode->i_dentry))

			ret = ext4_sync_parent(inode);

		if (test_opt(inode->i_sb, BARRIER))

			goto issue_flush;

		goto out;

	}
@@ -140,6 +142,7 @@ int ext4_sync_file(struct file *file, loff_t start, loff_t end, int datasync) 
		needs_barrier = true;

	ret = jbd2_complete_transaction(journal, commit_tid);

	if (needs_barrier) {

	issue_flush:

		err = blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL, NULL);

		if (!ret)

			ret = err;