From 34137e343ca1e88d38a66b5149824e384efd0524 Mon Sep 17 00:00:00 2001
From: Liu Bo <liubo2009@cn.fujitsu.com>
Date: Thu, 29 Mar 2012 09:57:45 -0400
Subject: [PATCH] --- yaml --- r: 297917 b: refs/heads/master c:
 e1f041e14cfb322f41f41a308bfede00f1b080cd h: refs/heads/master i:   297915:
 d18e1ded964962c2213790f16413468d816d8a4b v: v3

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

diff --git a/[refs] b/[refs]
index 7c227cc73002..f70043293a51 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66c2689226ac322fbc9acd2e8e418b78dcd52f51
+refs/heads/master: e1f041e14cfb322f41f41a308bfede00f1b080cd
diff --git a/trunk/fs/btrfs/ioctl.c b/trunk/fs/btrfs/ioctl.c
index afde837644e5..18cc23d164a8 100644
--- a/trunk/fs/btrfs/ioctl.c
+++ b/trunk/fs/btrfs/ioctl.c
@@ -1186,6 +1186,9 @@ int btrfs_defrag_file(struct inode *inode, struct file *file,
 			if (newer_off == (u64)-1)
 				break;
 
+			if (ret > 0)
+				i += ret;
+
 			newer_off = max(newer_off + 1,
 					(u64)i << PAGE_CACHE_SHIFT);