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/inode.c | |
| parent | 02da2d72174c61988eb4456b53f405e3ebdebce4 (diff) | |
| parent | 4673272f43ae790ab9ec04e38a7542f82bb8f020 (diff) | |
Merge branch 'misc-4.7' into for-chris-4.7-20160516
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 2aaba58b4856..167fc3d49450 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -10184,7 +10184,7 @@ static const struct file_operations btrfs_dir_file_operations = { .iterate = btrfs_real_readdir, .unlocked_ioctl = btrfs_ioctl, #ifdef CONFIG_COMPAT - .compat_ioctl = btrfs_ioctl, + .compat_ioctl = btrfs_compat_ioctl, #endif .release = btrfs_release_file, .fsync = btrfs_sync_file, |