summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/file.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2014-10-11 11:41:19 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-10-11 11:41:19 -0700
commit4af6600fd793023c01634cca5abfe4a2b707788f (patch)
tree9e3a830d7782512b492011932ddd789d13a900c4 /fs/btrfs/file.c
parent447a8b858e4bda41c394b1bc7fdbc9dc0bdf44f6 (diff)
parent68da166491655bc54051bf04c78ce648e2e33508 (diff)
downloadop-kernel-dev-4af6600fd793023c01634cca5abfe4a2b707788f.zip
op-kernel-dev-4af6600fd793023c01634cca5abfe4a2b707788f.tar.gz
Merge branch 'next' into for-linus
Prepare second round of input updates for 3.18.
Diffstat (limited to 'fs/btrfs/file.c')
-rw-r--r--fs/btrfs/file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 36861b7..ff1cc03 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1966,7 +1966,7 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
btrfs_init_log_ctx(&ctx);
- ret = btrfs_log_dentry_safe(trans, root, dentry, &ctx);
+ ret = btrfs_log_dentry_safe(trans, root, dentry, start, end, &ctx);
if (ret < 0) {
/* Fallthrough and commit/free transaction. */
ret = 1;
OpenPOWER on IntegriCloud