---

yaml --- r: 232990 b: refs/heads/master c: 4d728ec h: refs/heads/master v: v3
git-mirror · Jan 26, 2011 · 2997778 · 2997778
1 parent 673130b
commit 2997778
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b897abec032deb7cc3ce67392a1f544ac965ddea
+refs/heads/master: 4d728ec7aefdca5419d2ebfb28c147e81a4b59f4
diff --git a/trunk/fs/btrfs/ioctl.c b/trunk/fs/btrfs/ioctl.c
@@ -1788,7 +1788,10 @@ static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd,
 
 			memcpy(&new_key, &key, sizeof(new_key));
 			new_key.objectid = inode->i_ino;
-			new_key.offset = key.offset + destoff - off;
+			if (off <= key.offset)
+				new_key.offset = key.offset + destoff - off;
+			else
+				new_key.offset = destoff;
 
 			trans = btrfs_start_transaction(root, 1);
 			if (IS_ERR(trans)) {