Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.7

1 files changed, 4 insertions, 2 deletions

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 8d7b5a45c005..af059c44684d 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1696,7 +1696,9 @@ again:
                         btrfs_end_write_no_snapshoting(root);
                         btrfs_delalloc_release_metadata(inode, release_bytes);
                 } else {
-                        btrfs_delalloc_release_space(inode, pos, release_bytes);
+                        btrfs_delalloc_release_space(inode,
+                                                round_down(pos, root->sectorsize),
+                                                release_bytes);
                 }
         }
 
@@ -2956,7 +2958,7 @@ const struct file_operations btrfs_file_operations = {
         .fallocate      = btrfs_fallocate,
         .unlocked_ioctl = btrfs_ioctl,
 #ifdef CONFIG_COMPAT
-        .compat_ioctl   = btrfs_ioctl,
+        .compat_ioctl   = btrfs_compat_ioctl,
 #endif
         .copy_file_range = btrfs_copy_file_range,
         .clone_file_range = btrfs_clone_file_range,