diff options
| -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, | |||
| 1100 | aligned_dlen1 = ALIGN(dlen1, 8); | 1100 | aligned_dlen1 = ALIGN(dlen1, 8); |
| 1101 | aligned_dlen2 = ALIGN(dlen2, 8); | 1101 | aligned_dlen2 = ALIGN(dlen2, 8); |
| 1102 | len = aligned_dlen1 + aligned_dlen2 + ALIGN(ilen, 8) + ALIGN(plen, 8); | 1102 | len = aligned_dlen1 + aligned_dlen2 + ALIGN(ilen, 8) + ALIGN(plen, 8); |
| 1103 | if (old_dir != new_dir) | 1103 | if (move) |
| 1104 | len += plen; | 1104 | len += plen; |
| 1105 | dent = kmalloc(len, GFP_NOFS); | 1105 | dent = kmalloc(len, GFP_NOFS); |
| 1106 | if (!dent) | 1106 | if (!dent) |
| @@ -1216,7 +1216,7 @@ int ubifs_jnl_rename(struct ubifs_info *c, const struct inode *old_dir, | |||
| 1216 | if (err) | 1216 | if (err) |
| 1217 | goto out_ro; | 1217 | goto out_ro; |
| 1218 | 1218 | ||
| 1219 | if (old_dir != new_dir) { | 1219 | if (move) { |
| 1220 | offs += ALIGN(plen, 8); | 1220 | offs += ALIGN(plen, 8); |
| 1221 | ino_key_init(c, &key, new_dir->i_ino); | 1221 | ino_key_init(c, &key, new_dir->i_ino); |
| 1222 | err = ubifs_tnc_add(c, &key, lnum, offs, plen); | 1222 | err = ubifs_tnc_add(c, &key, lnum, offs, plen); |
