From e766140cbd4868cdeb59f9330a19acf65ab69cdb Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Fri, 18 Jul 2008 18:54:29 +0300 Subject: [PATCH] --- yaml --- r: 108531 b: refs/heads/master c: 182854b46f9feb6f1b03abe747bb2beeebf2adb0 h: refs/heads/master i: 108529: e45544ec2274ea96ce1178ee1f35d50633c8d110 108527: 33824ce14272930c4b13d4eb43617ca3c96f9677 v: v3 --- [refs] | 2 +- trunk/fs/ubifs/budget.c | 5 +++-- trunk/fs/ubifs/dir.c | 3 +-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index dd6ca100232a..68b6e05f2e14 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce769caa50a3fc835b4fc1a6e1463ada127a2e8a +refs/heads/master: 182854b46f9feb6f1b03abe747bb2beeebf2adb0 diff --git a/trunk/fs/ubifs/budget.c b/trunk/fs/ubifs/budget.c index d81fb9ed2b8e..12a1717db87c 100644 --- a/trunk/fs/ubifs/budget.c +++ b/trunk/fs/ubifs/budget.c @@ -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); } diff --git a/trunk/fs/ubifs/dir.c b/trunk/fs/ubifs/dir.c index e90374be7d3b..a79e850fee6d 100644 --- a/trunk/fs/ubifs/dir.c +++ b/trunk/fs/ubifs/dir.c @@ -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