Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e039533 authored by Richard Weinberger's avatar Richard Weinberger
Browse files

ubifs: Use move variable in ubifs_rename() 



...to make the code more consistent since we use
move already in other places.

Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 9ec64962

fs/ubifs/journal.c

+2 −2
Original line number Diff line number Diff line
@@ -1100,7 +1100,7 @@ int ubifs_jnl_rename(struct ubifs_info *c, const struct inode *old_dir, 
	aligned_dlen1 = ALIGN(dlen1, 8);

	aligned_dlen2 = ALIGN(dlen2, 8);

	len = aligned_dlen1 + aligned_dlen2 + ALIGN(ilen, 8) + ALIGN(plen, 8);

	if (old_dir != new_dir)

	if (move)

		len += plen;

	dent = kmalloc(len, GFP_NOFS);

	if (!dent)
@@ -1216,7 +1216,7 @@ int ubifs_jnl_rename(struct ubifs_info *c, const struct inode *old_dir, 
	if (err)

		goto out_ro;



	if (old_dir != new_dir) {

	if (move) {

		offs += ALIGN(plen, 8);

		ino_key_init(c, &key, new_dir->i_ino);

		err = ubifs_tnc_add(c, &key, lnum, offs, plen);