diff options
| author | Richard Weinberger <richard@nod.at> | 2016-09-14 22:28:52 +0200 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2016-10-02 22:55:02 +0200 |
| commit | 1e039533886765f50b4e58e7c337c84523ebf7b2 (patch) | |
| tree | af814877608ce90228e163c7d8fbe702fe178313 /fs/ubifs | |
| parent | 9ec64962afb1702f75bdf046fffeecf9c8737518 (diff) | |
| download | blackbird-op-linux-1e039533886765f50b4e58e7c337c84523ebf7b2.tar.gz blackbird-op-linux-1e039533886765f50b4e58e7c337c84523ebf7b2.zip | |
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>
Diffstat (limited to 'fs/ubifs')
| -rw-r--r-- | fs/ubifs/journal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ubifs/journal.c b/fs/ubifs/journal.c index 8e07f132e024..91bc76dc559e 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); |
