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

Commit 7d32c2bb authored by Artem Bityutskiy's avatar Artem Bityutskiy
Browse files

UBIFS: improve debugging 



1. Print inode mode in some of debugging messages
2. Add few more useful assertions

Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
parent 182854b4

fs/ubifs/file.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -941,7 +941,8 @@ int ubifs_setattr(struct dentry *dentry, struct iattr *attr) 
	struct inode *inode = dentry->d_inode;

	struct inode *inode = dentry->d_inode;

	struct ubifs_info *c = inode->i_sb->s_fs_info;

	struct ubifs_info *c = inode->i_sb->s_fs_info;





	dbg_gen("ino %lu, ia_valid %#x", inode->i_ino, attr->ia_valid);

	dbg_gen("ino %lu, mode %#x, ia_valid %#x",

		inode->i_ino, inode->i_mode, attr->ia_valid);

	err = inode_change_ok(inode, attr);

	err = inode_change_ok(inode, attr);

	if (err)

	if (err)

		return err;

		return err;

fs/ubifs/super.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -299,7 +299,7 @@ static int ubifs_write_inode(struct inode *inode, int wait) 
		return 0;

		return 0;

	}

	}





	dbg_gen("inode %lu", inode->i_ino);

	dbg_gen("inode %lu, mode %#x", inode->i_ino, (int)inode->i_mode);

	err = ubifs_jnl_write_inode(c, inode, 0);

	err = ubifs_jnl_write_inode(c, inode, 0);

	if (err)

	if (err)

		ubifs_err("can't write inode %lu, error %d", inode->i_ino, err);

		ubifs_err("can't write inode %lu, error %d", inode->i_ino, err);
@@ -323,9 +323,10 @@ static void ubifs_delete_inode(struct inode *inode) 
		 */

		 */

		goto out;

		goto out;





	dbg_gen("inode %lu", inode->i_ino);

	dbg_gen("inode %lu, mode %#x", inode->i_ino, (int)inode->i_mode);

	ubifs_assert(!atomic_read(&inode->i_count));

	ubifs_assert(!atomic_read(&inode->i_count));

	ubifs_assert(inode->i_nlink == 0);

	ubifs_assert(inode->i_nlink == 0);

	ubifs_assert(!ubifs_inode(inode)->dirty);





	truncate_inode_pages(&inode->i_data, 0);

	truncate_inode_pages(&inode->i_data, 0);

	if (is_bad_inode(inode))

	if (is_bad_inode(inode))
@@ -1469,6 +1470,7 @@ static void ubifs_put_super(struct super_block *sb) 
	 */

	 */

	ubifs_assert(atomic_long_read(&c->dirty_pg_cnt) == 0);

	ubifs_assert(atomic_long_read(&c->dirty_pg_cnt) == 0);

	ubifs_assert(c->budg_idx_growth == 0);

	ubifs_assert(c->budg_idx_growth == 0);

	ubifs_assert(c->budg_dd_growth == 0);

	ubifs_assert(c->budg_data_growth == 0);

	ubifs_assert(c->budg_data_growth == 0);





	/*

	/*