3 files changed, 8 insertions, 24 deletions

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 6d6e94b63803..800a3499cc3f 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -1219,10 +1219,7 @@ struct inode *btrfs_alloc_inode(struct super_block *sb);
 void btrfs_destroy_inode(struct inode *inode);
 int btrfs_init_cachep(void);
 void btrfs_destroy_cachep(void);
-int btrfs_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
-                unsigned long arg);
-long btrfs_compat_ioctl(struct file *file, unsigned int cmd,
-                               unsigned long arg);
+long btrfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
 struct inode *btrfs_iget_locked(struct super_block *s, u64 objectid,
                                 struct btrfs_root *root);
 int btrfs_commit_write(struct file *file, struct page *page,
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index c26ca54ed4de..ca7e5d4474e0 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -732,10 +732,10 @@ struct file_operations btrfs_file_operations = {
         .write          = btrfs_file_write,
         .mmap           = btrfs_file_mmap,
         .open           = generic_file_open,
-        .ioctl          = btrfs_ioctl,
         .fsync          = btrfs_sync_file,
+        .unlocked_ioctl = btrfs_ioctl,
 #ifdef CONFIG_COMPAT
-        .compat_ioctl   = btrfs_compat_ioctl,
+        .compat_ioctl   = btrfs_ioctl,
 #endif
 };
 
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index cde8ddde6098..3901a7fa0947 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -1957,9 +1957,10 @@ out_unlock:
         return 0;
 }
 
-int btrfs_ioctl(struct inode *inode, struct file *filp, unsigned int
+long btrfs_ioctl(struct file *file, unsigned int
                 cmd, unsigned long arg)
 {
+        struct inode *inode = file->f_path.dentry->d_inode;
         struct btrfs_root *root = BTRFS_I(inode)->root;
         struct btrfs_ioctl_vol_args vol_args;
         int ret = 0;
@@ -2007,7 +2008,7 @@ int btrfs_ioctl(struct inode *inode, struct file *filp, unsigned int
                         btrfs_defrag_root(root->fs_info->extent_root, 0);
                         mutex_unlock(&root->fs_info->fs_mutex);
                 } else if (S_ISREG(inode->i_mode)) {
-                        btrfs_defrag_file(filp);
+                        btrfs_defrag_file(file);
                 }
                 ret = 0;
                 break;
@@ -2017,20 +2018,6 @@ int btrfs_ioctl(struct inode *inode, struct file *filp, unsigned int
         return ret;
 }
 
-#ifdef CONFIG_COMPAT
-long btrfs_compat_ioctl(struct file *file, unsigned int cmd,
-                               unsigned long arg)
-{
-        struct inode *inode = file->f_path.dentry->d_inode;
-        int ret;
-        lock_kernel();
-        ret = btrfs_ioctl(inode, file, cmd, (unsigned long) compat_ptr(arg));
-        unlock_kernel();
-        return ret;
-
-}
-#endif
-
 /*
  * Called inside transaction, so use GFP_NOFS
  */
@@ -2341,9 +2328,9 @@ static struct file_operations btrfs_dir_file_operations = {
         .llseek         = generic_file_llseek,
         .read           = generic_read_dir,
         .readdir        = btrfs_readdir,
-        .ioctl          = btrfs_ioctl,
+        .unlocked_ioctl = btrfs_ioctl,
 #ifdef CONFIG_COMPAT
-        .compat_ioctl   = btrfs_compat_ioctl,
+        .compat_ioctl   = btrfs_ioctl,
 #endif
 };