---

yaml --- r: 167263 b: refs/heads/master c: ac6889c h: refs/heads/master i: 167261: 683bbd8 167259: c501c18 167255: 6421089 167247: 96cf02b 167231: 6782188 v: v3
git-mirror · Oct 9, 2009 · eff3a43 · eff3a43
1 parent 90eb31e
commit eff3a43
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9061e214810c9534381a705a1b46533e09f2676
+refs/heads/master: ac6889cbb254be1ffea376bea4a96ce9be0e0ed0
diff --git a/trunk/fs/btrfs/ioctl.c b/trunk/fs/btrfs/ioctl.c
@@ -1123,8 +1123,10 @@ static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd,
 					datao += off - key.offset;
 					datal -= off - key.offset;
 				}
-				if (key.offset + datao + datal > off + len)
-					datal = off + len - key.offset - datao;
+
+				if (key.offset + datal > off + len)
+					datal = off + len - key.offset;
+
 				/* disko == 0 means it's a hole */
 				if (!disko)
 					datao = 0;