summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorDmitry Monakhov <dmonakhov@openvz.org>2012-09-26 12:32:54 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-13 05:38:49 +0900
commita4bf81c2bf891cbd46d6a69ba15dd7d4350b62f3 (patch)
treeebd0ed1345080f00f044c9f010f11b4212926ca3 /fs
parent67bec353575f1205425c07bd76dbe5dfeb950a1e (diff)
downloadlinux-3.10-a4bf81c2bf891cbd46d6a69ba15dd7d4350b62f3.tar.gz
linux-3.10-a4bf81c2bf891cbd46d6a69ba15dd7d4350b62f3.tar.bz2
linux-3.10-a4bf81c2bf891cbd46d6a69ba15dd7d4350b62f3.zip
ext4: online defrag is not supported for journaled files
commit f066055a3449f0e5b0ae4f3ceab4445bead47638 upstream. Proper block swap for inodes with full journaling enabled is truly non obvious task. In order to be on a safe side let's explicitly disable it for now. Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/ext4/move_extent.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c
index df5cde5130c..e2016f34b58 100644
--- a/fs/ext4/move_extent.c
+++ b/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);