From: Richard Weinberger <richard@nod.at>
To: linux-mtd@lists.infradead.org
Cc: linux-kernel@vger.kernel.org, richard@nod.at,
dedekind1@gmail.com, adrian.hunter@intel.com
Subject: [PATCH 4/4] ubifs: Use move variable in ubifs_rename()
Date: Tue, 13 Sep 2016 16:18:58 +0200 [thread overview]
Message-ID: <1473776338-18816-5-git-send-email-richard@nod.at> (raw)
In-Reply-To: <1473776338-18816-1-git-send-email-richard@nod.at>
...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 aa16ca5..167d300 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
next prev parent reply other threads:[~2016-09-13 14:20 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-13 14:18 [PATCH 0/4] ubifs: Add overlayfs support Richard Weinberger
2016-09-13 14:18 ` [PATCH 1/4] ubifs: Implement O_TMPFILE Richard Weinberger
2016-09-13 14:18 ` [PATCH 2/4] ubifs: Implement RENAME_WHITEOUT Richard Weinberger
2016-09-13 14:47 ` kbuild test robot
2016-09-13 20:39 ` Richard Weinberger
2016-09-13 14:18 ` [PATCH 3/4] ubifs: Implement RENAME_EXCHANGE Richard Weinberger
2016-09-13 14:18 ` Richard Weinberger [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-09-14 20:28 [PATCH v2 0/4] ubifs: Add overlayfs support Richard Weinberger
2016-09-14 20:28 ` [PATCH 4/4] ubifs: Use move variable in ubifs_rename() Richard Weinberger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1473776338-18816-5-git-send-email-richard@nod.at \
--to=richard@nod.at \
--cc=adrian.hunter@intel.com \
--cc=dedekind1@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).