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/ctree.h | |
| parent | 02da2d72174c61988eb4456b53f405e3ebdebce4 (diff) | |
| parent | 4673272f43ae790ab9ec04e38a7542f82bb8f020 (diff) | |
| download | linux-73d32ce21e1701eaafcea3cbc2a8f27ab1967abe.tar.gz linux-73d32ce21e1701eaafcea3cbc2a8f27ab1967abe.tar.xz | |
Merge branch 'misc-4.7' into for-chris-4.7-20160516
Diffstat (limited to 'fs/btrfs/ctree.h')
| -rw-r--r-- | fs/btrfs/ctree.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 84a6a5b3384a..208d19938fdf 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -4122,6 +4122,7 @@ void btrfs_test_inode_set_ops(struct inode *inode); /* ioctl.c */ long btrfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg); +long btrfs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg); int btrfs_ioctl_get_supported_features(void __user *arg); void btrfs_update_iflags(struct inode *inode); void btrfs_inherit_iflags(struct inode *inode, struct inode *dir); |