Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d577bc10 authored by Richard Weinberger's avatar Richard Weinberger Committed by Artem Bityutskiy
Browse files

UBIFS: Remove bogus assert 



This assertion was only correct before UBIFS had xattr support.
Now with xattr support also a directory node can carry data
and can act as host node.

Suggested-by: default avatarArtem Bityutskiy <dedekind1@gmail.com>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
parent fda322a1

fs/ubifs/journal.c

+3 −4
Original line number Diff line number Diff line
@@ -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: