[Devel] [PATCH RHEL7 COMMIT] ext4: Fix rebase c55a9acde5aa

[Vasily Averin]

The commit is pushed to "branch-rh7-3.10.0-1160.31.1.vz7.181.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-1160.31.1.vz7.181.8
------>
commit 7378530c563fdea013ee25c434f06adc37ab500c
Author: Kirill Tkhai <ktkhai at virtuozzo.com>
Date:   Tue Jun 22 21:51:05 2021 +0300

    ext4: Fix rebase c55a9acde5aa
    
    Move writeout procession under journal.
    
    Signed-off-by: Kirill Tkhai <ktkhai at virtuozzo.com>
---
 fs/ext4/namei.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index c66b4f7..e2dea0b 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -3452,18 +3452,18 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry,
 	retval = 0;
 
 end_rename:
-	if (handle)
-		ext4_journal_stop(handle);
-out_release:
-	brelse(old.dir_bh);
-	brelse(old.bh);
-	brelse(new.bh);
 	if (whiteout) {
 		if (retval)
 			drop_nlink(whiteout);
 		unlock_new_inode(whiteout);
 		iput(whiteout);
 	}
+	if (handle)
+		ext4_journal_stop(handle);
+out_release:
+	brelse(old.dir_bh);
+	brelse(old.bh);
+	brelse(new.bh);
 	return retval;
 }