diff options
| author | David Sterba <dsterba@suse.com> | 2016-05-16 15:46:23 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-05-16 15:46:23 +0200 |
| commit | 73d32ce21e1701eaafcea3cbc2a8f27ab1967abe (patch) | |
| tree | 136c03e4be575e4466ef9df119b8debdf768a56a /fs/btrfs/file.c | |
| parent | 02da2d72174c61988eb4456b53f405e3ebdebce4 (diff) | |
| parent | 4673272f43ae790ab9ec04e38a7542f82bb8f020 (diff) | |
Merge branch 'misc-4.7' into for-chris-4.7-20160516
Diffstat (limited to 'fs/btrfs/file.c')
| -rw-r--r-- | fs/btrfs/file.c | 6 |
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, |