Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

UBIFS: improve znode splitting rules

Browse source 
When inserting into a full znode it is split into two
znodes.  Because data node keys are usually consecutive,
it is better to try to keep them together.  This patch
does a better job of that.

Signed-off-by: Adrian Hunter <ext-adrian.hunter@nokia.com>
This commit is contained in:
Adrian Hunter 2008-09-05 11:56:05 +03:00 committed by Artem Bityutskiy
parent 2953e73f1c
commit 2242c689ec
1 changed files with 33 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
fs/ubifs/tnc.c
View file

@ -1962,7 +1962,7 @@ static int tnc_insert(struct ubifs_info *c, struct ubifs_znode *znode,
{ {
struct ubifs_znode *zn, *zi, *zp; struct ubifs_znode *zn, *zi, *zp;
int i, keep, move, appending = 0; int i, keep, move, appending = 0;
union ubifs_key *key = &zbr->key; union ubifs_key *key = &zbr->key, *key1;
ubifs_assert(n >= 0 && n <= c->fanout); ubifs_assert(n >= 0 && n <= c->fanout);
@ -2003,20 +2003,33 @@ static int tnc_insert(struct ubifs_info *c, struct ubifs_znode *znode,
zn->level = znode->level; zn->level = znode->level;
/* Decide where to split */ /* Decide where to split */
if (znode->level == 0 && n == c->fanout && if (znode->level == 0 && key_type(c, key) == UBIFS_DATA_KEY) {
key_type(c, key) == UBIFS_DATA_KEY) { /* Try not to split consecutive data keys */
union ubifs_key *key1; if (n == c->fanout) {
key1 = &znode->zbranch[n - 1].key;
/* if (key_inum(c, key1) == key_inum(c, key) &&
* If this is an inode which is being appended - do not split key_type(c, key1) == UBIFS_DATA_KEY)
* it because no other zbranches can be inserted between appending = 1;
* zbranches of consecutive data nodes anyway. } else
*/ goto check_split;
key1 = &znode->zbranch[n - 1].key; } else if (appending && n != c->fanout) {
if (key_inum(c, key1) == key_inum(c, key) && /* Try not to split consecutive data keys */
key_type(c, key1) == UBIFS_DATA_KEY && appending = 0;
key_block(c, key1) == key_block(c, key) - 1) check_split:
appending = 1; if (n >= (c->fanout + 1) / 2) {
key1 = &znode->zbranch[0].key;
if (key_inum(c, key1) == key_inum(c, key) &&
key_type(c, key1) == UBIFS_DATA_KEY) {
key1 = &znode->zbranch[n].key;
if (key_inum(c, key1) != key_inum(c, key) ||
key_type(c, key1) != UBIFS_DATA_KEY) {
keep = n;
move = c->fanout - keep;
zi = znode;
goto do_split;
}
}
}
} }
if (appending) { if (appending) {
@ -2046,6 +2059,8 @@ static int tnc_insert(struct ubifs_info *c, struct ubifs_znode *znode,
zbr->znode->parent = zn; zbr->znode->parent = zn;
} }
do_split:
__set_bit(DIRTY_ZNODE, &zn->flags); __set_bit(DIRTY_ZNODE, &zn->flags);
atomic_long_inc(&c->dirty_zn_cnt); atomic_long_inc(&c->dirty_zn_cnt);
@ -2072,14 +2087,11 @@ static int tnc_insert(struct ubifs_info *c, struct ubifs_znode *znode,
/* Insert new znode (produced by spitting) into the parent */ /* Insert new znode (produced by spitting) into the parent */
if (zp) { if (zp) {
i = n; if (n == 0 && zi == znode && znode->iip == 0)
correct_parent_keys(c, znode);
/* Locate insertion point */ /* Locate insertion point */
n = znode->iip + 1; n = znode->iip + 1;
if (appending && n != c->fanout)
appending = 0;
if (i == 0 && zi == znode && znode->iip == 0)
correct_parent_keys(c, znode);
/* Tail recursion */ /* Tail recursion */
zbr->key = zn->zbranch[0].key; zbr->key = zn->zbranch[0].key;