From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 23 Oct 2010 02:30:38 +0000 (-0700)
Subject: ocfs2: drop the BLKDEV_IFL_WAIT flag
X-Git-Tag: accepted/tizen/common/20141203.182822~9846
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f8cae0f03f75adb54b1d48ddbc90f84a1f5de186;p=platform%2Fkernel%2Flinux-arm64.git

ocfs2: drop the BLKDEV_IFL_WAIT flag

Commit dd3932eddf42 ("block: remove BLKDEV_IFL_WAIT") had removed the
flag argument to blkdev_issue_flush(), but the ocfs2 merge brought in a
new one.  It didn't cause a merge conflict, so the merges silently
worked out fine, but the result didn't actually compile.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 9e8cc43..1ca6867 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -187,8 +187,7 @@ static int ocfs2_sync_file(struct file *file, int datasync)
 		 * platter
 		 */
 		if (osb->s_mount_opt & OCFS2_MOUNT_BARRIER)
-			blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL,
-					   NULL, BLKDEV_IFL_WAIT);
+			blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL, NULL);
 		goto bail;
 	}