[2/2] btrfs: allow cross-subvolume BTRFS_IOC_CLONE

Commit Message

Larry D'Anna March 31, 2011, 4 a.m. UTC

None

Patch

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index f9717b6..10095c7 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -1804,6 +1804,7 @@  static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd,
 {
 	struct inode *inode = fdentry(file)->d_inode;
 	struct btrfs_root *root = BTRFS_I(inode)->root;
+	struct btrfs_root *srcroot;
 	struct file *src_file;
 	struct inode *src;
 	struct btrfs_trans_handle *trans;
@@ -1846,6 +1847,7 @@  static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd,
 	}
 
 	src = src_file->f_dentry->d_inode;
+	srcroot = BTRFS_I(src)->root;
 
 	ret = -EINVAL;
 	if (src == inode)
@@ -1860,11 +1862,11 @@  static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd,
 		goto out_fput;
 
 	ret = -EXDEV;
-	if (src->i_sb != inode->i_sb || BTRFS_I(src)->root != root)
+	if (src->i_sb != inode->i_sb)
 		goto out_fput;
 
 	ret = -ENOMEM;
-	buf = vmalloc(btrfs_level_size(root, 0));
+	buf = vmalloc(btrfs_level_size(srcroot, 0));
 	if (!buf)
 		goto out_fput;
 
@@ -1924,13 +1926,13 @@  static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd,
 		 * note the key will change type as we walk through the
 		 * tree.
 		 */
-		ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);
+		ret = btrfs_search_slot(NULL, srcroot, &key, path, 0, 0);
 		if (ret < 0)
 			goto out;
 
 		nritems = btrfs_header_nritems(path->nodes[0]);
 		if (path->slots[0] >= nritems) {
-			ret = btrfs_next_leaf(root, path);
+			ret = btrfs_next_leaf(srcroot, path);
 			if (ret < 0)
 				goto out;
 			if (ret > 0)