---

yaml --- r: 263979 b: refs/heads/master c: 0e7b824 h: refs/heads/master i: 263977: 437d1dc 263975: 801de5a v: v3
git-mirror · Sep 18, 2011 · cad5c0a · cad5c0a
1 parent 4665f50
commit cad5c0a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71ef07861080418d125dcf454af41baafa409a2c
+refs/heads/master: 0e7b824c4ef9f5bcf5e48cdce164a7b349dde969
diff --git a/trunk/fs/btrfs/ioctl.c b/trunk/fs/btrfs/ioctl.c
@@ -2185,6 +2185,11 @@ static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd,
 	if (!(src_file->f_mode & FMODE_READ))
 		goto out_fput;
 
+	/* don't make the dst file partly checksummed */
+	if ((BTRFS_I(src)->flags & BTRFS_INODE_NODATASUM) !=
+	    (BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM))
+		goto out_fput;
+
 	ret = -EISDIR;
 	if (S_ISDIR(src->i_mode) || S_ISDIR(inode->i_mode))
 		goto out_fput;