aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-22 19:30:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-22 19:30:38 -0700
commitf8cae0f03f75adb54b1d48ddbc90f84a1f5de186 (patch)
tree6007d5bb2b955d6509cfb19384aba85c8d4caa94
parentd2ecad9faca2221ae6f664f146f0dcae661bf39d (diff)
downloadmrst-s0i3-test-f8cae0f03f75adb54b1d48ddbc90f84a1f5de186.tar.gz
mrst-s0i3-test-f8cae0f03f75adb54b1d48ddbc90f84a1f5de186.tar.xz
mrst-s0i3-test-f8cae0f03f75adb54b1d48ddbc90f84a1f5de186.zip
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>
-rw-r--r--fs/ocfs2/file.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 9e8cc4346b7..1ca6867935b 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;
}