No reason to grab the BKL before calling into the btrfs ioctl code.
Signed-off-by: Christoph Hellwig <[EMAIL PROTECTED]>
Index: btrfs-0d4a5b197024/ctree.h
===================================================================
--- btrfs-0d4a5b197024.orig/ctree.h 2007-09-14 13:30:33.000000000 +0200
+++ btrfs-0d4a5b197024/ctree.h 2007-09-14 13:31:33.000000000 +0200
@@ -1219,10 +1219,7 @@ struct inode *btrfs_alloc_inode(struct s
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,
Index: btrfs-0d4a5b197024/file.c
===================================================================
--- btrfs-0d4a5b197024.orig/file.c 2007-09-14 13:30:33.000000000 +0200
+++ btrfs-0d4a5b197024/file.c 2007-09-14 13:31:33.000000000 +0200
@@ -732,10 +732,10 @@ struct file_operations btrfs_file_operat
.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
};
Index: btrfs-0d4a5b197024/inode.c
===================================================================
--- btrfs-0d4a5b197024.orig/inode.c 2007-09-14 13:30:33.000000000 +0200
+++ btrfs-0d4a5b197024/inode.c 2007-09-14 13:32:04.000000000 +0200
@@ -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, str
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, str
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
*/
@@ -2348,9 +2335,9 @@ static struct file_operations btrfs_dir_
.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
};
_______________________________________________
Btrfs-devel mailing list
[email protected]
http://oss.oracle.com/mailman/listinfo/btrfs-devel
