Merge branch 'master' into tk71

[mv-sheeva.git] / fs / reiserfs / file.c

diff --git a/fs/reiserfs/file.c b/fs/reiserfs/file.c
index 6846371498b685becc1ff8eba16b2e62933c57d5..91f080cc76c8d98e9ad94625eb56843d17e6ba15 100644 (file)
--- a/fs/reiserfs/file.c
+++ b/fs/reiserfs/file.c
@@ -152,8 +152,7 @@ static int reiserfs_sync_file(struct file *filp, int datasync)
        barrier_done = reiserfs_commit_for_inode(inode);
        reiserfs_write_unlock(inode->i_sb);
        if (barrier_done != 1 && reiserfs_barrier_flush(inode->i_sb))
-               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);
        if (barrier_done < 0)
                return barrier_done;
        return (err < 0) ? -EIO : 0;