---

yaml --- r: 297917 b: refs/heads/master c: e1f041e h: refs/heads/master i: 297915: d18e1de v: v3
git-mirror · Mar 29, 2012 · 34137e3 · 34137e3
1 parent 90a6674
commit 34137e3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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);