Commit f8cae0f0 authored by Linus Torvalds's avatar Linus Torvalds

ocfs2: drop the BLKDEV_IFL_WAIT flag

Commit dd3932ed ("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: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d2ecad9f
...@@ -187,8 +187,7 @@ static int ocfs2_sync_file(struct file *file, int datasync) ...@@ -187,8 +187,7 @@ static int ocfs2_sync_file(struct file *file, int datasync)
* platter * platter
*/ */
if (osb->s_mount_opt & OCFS2_MOUNT_BARRIER) if (osb->s_mount_opt & OCFS2_MOUNT_BARRIER)
blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL, blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL, NULL);
NULL, BLKDEV_IFL_WAIT);
goto bail; goto bail;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment