Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1483648

[PATCH 4/4] ubifs: Use move variable in ubifs_rename()

Show all headers | View raw

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

Signed-off-by: Richard Weinberger <richard@nod.at>
---
 fs/ubifs/journal.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/ubifs/journal.c b/fs/ubifs/journal.c
index 8e07f13..91bc76dc 100644
--- a/fs/ubifs/journal.c
+++ b/fs/ubifs/journal.c
@@ -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);
-- 
2.7.3

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 0/4] ubifs: Add overlayfs support Richard Weinberger <richard@nod.at> - 2016-09-14 22:40 +0200
  [PATCH 2/4] ubifs: Implement RENAME_WHITEOUT Richard Weinberger <richard@nod.at> - 2016-09-14 22:40 +0200
  [PATCH 3/4] ubifs: Implement RENAME_EXCHANGE Richard Weinberger <richard@nod.at> - 2016-09-14 22:40 +0200
  [PATCH 4/4] ubifs: Use move variable in ubifs_rename() Richard Weinberger <richard@nod.at> - 2016-09-14 22:40 +0200
  [PATCH 1/4] ubifs: Implement O_TMPFILE Richard Weinberger <richard@nod.at> - 2016-09-14 22:40 +0200
  Re: [PATCH v2 0/4] ubifs: Add overlayfs support Felix Fietkau <nbd@nbd.name> - 2016-09-15 11:40 +0200

csiph-web