diff --git a/[refs] b/[refs] index d6ea2a7c7999..0ad44b9647ab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 006a58a25fe8aaa7559be80dcff94d98aee84309 +refs/heads/master: bb8885cc0aa6b1606143d92c70762b16026016a5 diff --git a/trunk/fs/btrfs/file.c b/trunk/fs/btrfs/file.c index a50507f3056d..c89c3ac4b23b 100644 --- a/trunk/fs/btrfs/file.c +++ b/trunk/fs/btrfs/file.c @@ -961,7 +961,7 @@ static ssize_t btrfs_file_write(struct file *file, const char __user *buf, if (err < 0) num_written = err; } else if (num_written > 0 && (file->f_flags & O_DIRECT)) { -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) do_sync_file_range(file, start_pos, start_pos + num_written - 1, SYNC_FILE_RANGE_WRITE |