---

yaml --- r: 331598 b: refs/heads/master c: f066055 h: refs/heads/master v: v3
git-mirror · Sep 26, 2012 · 18e190d · 18e190d
1 parent 57f6b40
commit 18e190d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 03bd8b9b896c8e940f282f540e6b4de90d666b7c
+refs/heads/master: f066055a3449f0e5b0ae4f3ceab4445bead47638
diff --git a/trunk/fs/ext4/move_extent.c b/trunk/fs/ext4/move_extent.c
@@ -1142,7 +1142,12 @@ ext4_move_extents(struct file *o_filp, struct file *d_filp,
 			orig_inode->i_ino, donor_inode->i_ino);
 		return -EINVAL;
 	}
-
+	/* TODO: This is non obvious task to swap blocks for inodes with full
+	   jornaling enabled */
+	if (ext4_should_journal_data(orig_inode) ||
+	    ext4_should_journal_data(donor_inode)) {
+		return -EINVAL;
+	}
 	/* Protect orig and donor inodes against a truncate */
 	mext_inode_double_lock(orig_inode, donor_inode);