| 123456789101112131415161718192021222324252627282930 |
- From: Richard Weinberger <richard@nod.at>
- Date: Tue, 13 Sep 2016 16:18:58 +0200
- Subject: [PATCH] ubifs: Use move variable in ubifs_rename()
- ...to make the code more consistent since we use
- move already in other places.
- Signed-off-by: Richard Weinberger <richard@nod.at>
- ---
- --- a/fs/ubifs/journal.c
- +++ b/fs/ubifs/journal.c
- @@ -1100,7 +1100,7 @@ int ubifs_jnl_rename(struct ubifs_info *
- 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 *
- 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);
|
