]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
ocfs2: drop the BLKDEV_IFL_WAIT flag
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Oct 2010 02:30:38 +0000 (19:30 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Oct 2010 02:30:38 +0000 (19:30 -0700)
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>
fs/ocfs2/file.c

index 9e8cc4346b761e6246494416787b5b78c193f01e..1ca6867935bbc62e4f733f703951d9f39c7bab93 100644 (file)
@@ -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;
        }