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

Commit 25736b1c authored by Chris Mason's avatar Chris Mason Committed by Linus Torvalds
Browse files

[PATCH] reiserfs_fsync should only use barriers when they are enabled 



make sure that reiserfs_fsync only triggers barriers when mounted with -o
barrier=flush

Signed-off-by: default avatarChris Mason <mason@suse.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d4328b40

fs/reiserfs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ static int reiserfs_sync_file(struct file *p_s_filp, 
	reiserfs_write_lock(p_s_inode->i_sb);

	barrier_done = reiserfs_commit_for_inode(p_s_inode);

	reiserfs_write_unlock(p_s_inode->i_sb);

	if (barrier_done != 1)

	if (barrier_done != 1 && reiserfs_barrier_flush(p_s_inode->i_sb))

		blkdev_issue_flush(p_s_inode->i_sb->s_bdev, NULL);

	if (barrier_done < 0)

		return barrier_done;