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

Commit 182854b4 authored by Artem Bityutskiy's avatar Artem Bityutskiy
Browse files

UBIFS: fix budgeting calculations 



The 'ubifs_release_dirty_inode_budget()' was buggy and incorrectly
freed the budget, which led to not freeing all dirty data budget.
This patch fixes that.

Also, this patch fixes ubifs_mkdir() which passed 1 in dirty_ino_d,
which makes no sense. Well, it is harmless though.

Also, add few more useful assertions. And improve few debugging
messages.

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

fs/ubifs/budget.c

+3 −2
Original line number Diff line number Diff line
@@ -686,9 +686,10 @@ void ubifs_convert_page_budget(struct ubifs_info *c) 
void ubifs_release_dirty_inode_budget(struct ubifs_info *c,

				      struct ubifs_inode *ui)

{

	struct ubifs_budget_req req = {.dd_growth = c->inode_budget,

				       .dirtied_ino_d = ui->data_len};

	struct ubifs_budget_req req;



	memset(&req, 0, sizeof(struct ubifs_budget_req));

	req.dd_growth = c->inode_budget + ui->data_len;

	ubifs_release_budget(c, &req);

}

fs/ubifs/dir.c

+1 −2
Original line number Diff line number Diff line
@@ -727,8 +727,7 @@ static int ubifs_mkdir(struct inode *dir, struct dentry *dentry, int mode) 
	struct ubifs_inode *dir_ui = ubifs_inode(dir);

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

	int err, sz_change = CALC_DENT_SIZE(dentry->d_name.len);

	struct ubifs_budget_req req = { .new_ino = 1, .new_dent = 1,

					.dirtied_ino_d = 1 };

	struct ubifs_budget_req req = { .new_ino = 1, .new_dent = 1 };



	/*

	 * Budget request settings: new inode, new direntry and changing parent