---

yaml --- r: 263740 b: refs/heads/master c: d525e8a h: refs/heads/master v: v3
git-mirror · Sep 11, 2011 · e8ea3db · e8ea3db
1 parent 8ca8120
commit e8ea3db
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d72c0842ff0e71342857723bb65f35b71f57b264
+refs/heads/master: d525e8ab022cb000e6e31a515ba8c3cf0d9c6130
diff --git a/trunk/fs/btrfs/ioctl.c b/trunk/fs/btrfs/ioctl.c
@@ -2228,6 +2228,12 @@ static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd,
 	    !IS_ALIGNED(destoff, bs))
 		goto out_unlock;
 
+	if (destoff > inode->i_size) {
+		ret = btrfs_cont_expand(inode, inode->i_size, destoff);
+		if (ret)
+			goto out_unlock;
+	}
+
 	/* do any pending delalloc/csum calc on src, one way or
 	   another, and lock file content */
 	while (1) {