---

yaml --- r: 165907 b: refs/heads/master c: 1fb58a6 h: refs/heads/master i: 165905: 3dfdc19 165903: bfe44c5 v: v3
git-mirror · Sep 21, 2009 · b300f04 · b300f04
1 parent cf36346
commit b300f04
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76dda93c6ae2c1dc3e6cde34569d6aca26b0c918
+refs/heads/master: 1fb58a6051cd904a9f8e0344b22e31921d6b5a4d
diff --git a/trunk/fs/btrfs/ioctl.c b/trunk/fs/btrfs/ioctl.c
@@ -1105,8 +1105,7 @@ 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 + key.offset >
-				    off + len)
+				if (key.offset + datao + datal > off + len)
 					datal = off + len - key.offset - datao;
 				/* disko == 0 means it's a hole */
 				if (!disko)