Merge branch 'stable-3.18' of git://git.infradead.org/users/pcmoore/audit

[firefly-linux-kernel-4.4.55.git] / fs / ubifs / journal.c

diff --git a/fs/ubifs/journal.c b/fs/ubifs/journal.c
index 0e045e75abd8ab7ac1a17cd502c9ff0c22d691e3..fb166e204441d880662e213cc07974c6b4380e89 100644 (file)
--- 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,
        int aligned_dlen, aligned_ilen, sync = IS_DIRSYNC(dir);
        int last_reference = !!(deletion && inode->i_nlink == 0);
        struct ubifs_inode *ui = ubifs_inode(inode);
-       struct ubifs_inode *dir_ui = ubifs_inode(dir);
+       struct ubifs_inode *host_ui = ubifs_inode(dir);
        struct ubifs_dent_node *dent;
        struct ubifs_ino_node *ino;
        union ubifs_key dent_key, ino_key;
 
        dbg_jnl("ino %lu, dent '%.*s', data len %d in dir ino %lu",
                inode->i_ino, nm->len, nm->name, ui->data_len, dir->i_ino);
-       ubifs_assert(dir_ui->data_len == 0);
-       ubifs_assert(mutex_is_locked(&dir_ui->ui_mutex));
+       ubifs_assert(mutex_is_locked(&host_ui->ui_mutex));
 
        dlen = UBIFS_DENT_NODE_SZ + nm->len + 1;
        ilen = UBIFS_INO_NODE_SZ;
@@ -658,7 +657,7 @@ int ubifs_jnl_update(struct ubifs_info *c, const struct inode *dir,
        ui->synced_i_size = ui->ui_size;
        spin_unlock(&ui->ui_lock);
        mark_inode_clean(c, ui);
-       mark_inode_clean(c, dir_ui);
+       mark_inode_clean(c, host_ui);
        return 0;
 
 out_finish: