From eff3a43388d23ccfdf296ad07aa3c91cb69d3fcd Mon Sep 17 00:00:00 2001
From: Chris Mason <chris.mason@oracle.com>
Date: Fri, 9 Oct 2009 11:29:53 -0400
Subject: [PATCH] --- yaml --- r: 167263 b: refs/heads/master c:
 ac6889cbb254be1ffea376bea4a96ce9be0e0ed0 h: refs/heads/master i:   167261:
 683bbd8e0f40571512c8948939150125b40a9b33   167259:
 c501c184fa7153a326ce2353c1dd0714ba8fb7a6   167255:
 642108900d73b5c2b3fb48b751e1ced151e0a47a   167247:
 96cf02bf1ae1b8d3e287552b2838657d8e173442   167231:
 67821888dcf2c49cc20ae4974874c91bdacbeba6 v: v3

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

diff --git a/[refs] b/[refs]
index 970aa531c31a..cc4509abc2ca 100644
--- 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
index e8795becad4c..cdbb054102b9 100644
--- 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;