From b300f044c9611a33cde940b4e3ea61d6fbb0ab1a Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Mon, 21 Sep 2009 16:00:27 -0400
Subject: [PATCH] --- yaml --- r: 165907 b: refs/heads/master c:
 1fb58a6051cd904a9f8e0344b22e31921d6b5a4d h: refs/heads/master i:   165905:
 3dfdc19390d89d3133b8f1e9050949d318d8b414   165903:
 bfe44c54ded55b19cfc583fa484bd9bd3cf8082c v: v3

---
 [refs]                 | 2 +-
 trunk/fs/btrfs/ioctl.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 61318e4bca2c..3710af17707b 100644
--- 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
index a13fd556db74..a8577a7f26ab 100644
--- 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)