diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2012-10-16 17:03:08 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-10-16 17:03:08 -0400 |
| commit | cccfd9254fe8f5a5cf21801f97408e3d4536a099 (patch) | |
| tree | d4e26c2b66440369b73a143e73a51756f36e2cfc /fs/ext4/move_extent.c | |
| parent | 5df08aeb90f542384bd1c362ff8608f3d39503d5 (diff) | |
| parent | 40e6f9362555294cf1ce8abb1981b11d622e04d6 (diff) | |
Merge tag 'v3.0.46' into v3.0-rt
This is the 3.0.46 stable release
Diffstat (limited to 'fs/ext4/move_extent.c')
| -rw-r--r-- | fs/ext4/move_extent.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c index f57455a1b1b2..72f97326baa4 100644 --- a/fs/ext4/move_extent.c +++ b/fs/ext4/move_extent.c @@ -1209,7 +1209,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 */ ret1 = mext_inode_double_lock(orig_inode, donor_inode); if (ret1 < 0) |