diff options
Diffstat (limited to 'fs/ubifs')
-rw-r--r-- | fs/ubifs/journal.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/ubifs/journal.c b/fs/ubifs/journal.c index 0e045e75abd8..fb166e204441 100644 --- a/fs/ubifs/journal.c +++ b/fs/ubifs/journal.c | |||
@@ -546,15 +546,14 @@ int ubifs_jnl_update(struct ubifs_info *c, const struct inode *dir, | |||
546 | int aligned_dlen, aligned_ilen, sync = IS_DIRSYNC(dir); | 546 | int aligned_dlen, aligned_ilen, sync = IS_DIRSYNC(dir); |
547 | int last_reference = !!(deletion && inode->i_nlink == 0); | 547 | int last_reference = !!(deletion && inode->i_nlink == 0); |
548 | struct ubifs_inode *ui = ubifs_inode(inode); | 548 | struct ubifs_inode *ui = ubifs_inode(inode); |
549 | struct ubifs_inode *dir_ui = ubifs_inode(dir); | 549 | struct ubifs_inode *host_ui = ubifs_inode(dir); |
550 | struct ubifs_dent_node *dent; | 550 | struct ubifs_dent_node *dent; |
551 | struct ubifs_ino_node *ino; | 551 | struct ubifs_ino_node *ino; |
552 | union ubifs_key dent_key, ino_key; | 552 | union ubifs_key dent_key, ino_key; |
553 | 553 | ||
554 | dbg_jnl("ino %lu, dent '%.*s', data len %d in dir ino %lu", | 554 | dbg_jnl("ino %lu, dent '%.*s', data len %d in dir ino %lu", |
555 | inode->i_ino, nm->len, nm->name, ui->data_len, dir->i_ino); | 555 | inode->i_ino, nm->len, nm->name, ui->data_len, dir->i_ino); |
556 | ubifs_assert(dir_ui->data_len == 0); | 556 | ubifs_assert(mutex_is_locked(&host_ui->ui_mutex)); |
557 | ubifs_assert(mutex_is_locked(&dir_ui->ui_mutex)); | ||
558 | 557 | ||
559 | dlen = UBIFS_DENT_NODE_SZ + nm->len + 1; | 558 | dlen = UBIFS_DENT_NODE_SZ + nm->len + 1; |
560 | ilen = UBIFS_INO_NODE_SZ; | 559 | ilen = UBIFS_INO_NODE_SZ; |
@@ -658,7 +657,7 @@ int ubifs_jnl_update(struct ubifs_info *c, const struct inode *dir, | |||
658 | ui->synced_i_size = ui->ui_size; | 657 | ui->synced_i_size = ui->ui_size; |
659 | spin_unlock(&ui->ui_lock); | 658 | spin_unlock(&ui->ui_lock); |
660 | mark_inode_clean(c, ui); | 659 | mark_inode_clean(c, ui); |
661 | mark_inode_clean(c, dir_ui); | 660 | mark_inode_clean(c, host_ui); |
662 | return 0; | 661 | return 0; |
663 | 662 | ||
664 | out_finish: | 663 | out_finish: |