ext4: don't set up encryption key during jbd2 transaction

[linux-2.6-block.git] / fs / ext4 / fast_commit.c

diff --git a/fs/ext4/fast_commit.c b/fs/ext4/fast_commit.c
index 6d98f2b39b7754f5cbfbfbf7df741452295b1f86..da0c8228cf9c3d5d400778d9872d97838f83507d 100644 (file)
--- a/fs/ext4/fast_commit.c
+++ b/fs/ext4/fast_commit.c
@@ -1397,7 +1397,7 @@ static int ext4_fc_replay_unlink(struct super_block *sb, struct ext4_fc_tl *tl,
                return 0;
        }
 
-       ret = __ext4_unlink(NULL, old_parent, &entry, inode);
+       ret = __ext4_unlink(old_parent, &entry, inode, NULL);
        /* -ENOENT ok coz it might not exist anymore. */
        if (ret == -ENOENT)
                ret = 0;