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

Commit 0e26b6e2 authored by Sascha Hauer's avatar Sascha Hauer Committed by Richard Weinberger
Browse files

ubifs: Export pnode_lookup as ubifs_pnode_lookup 



ubifs_lpt_lookup could be implemented using pnode_lookup. To make that
possible move pnode_lookup from lpt.c to lpt_commit.c. Rename it to
ubifs_pnode_lookup since it's now exported.

Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 22ceaa8c

fs/ubifs/lpt.c

+32 −0
Original line number Diff line number Diff line
@@ -1438,6 +1438,38 @@ struct ubifs_pnode *ubifs_get_pnode(struct ubifs_info *c, 
	return branch->pnode;

}



/**

 * ubifs_pnode_lookup - lookup a pnode in the LPT.

 * @c: UBIFS file-system description object

 * @i: pnode number (0 to (main_lebs - 1) / UBIFS_LPT_FANOUT)

 *

 * This function returns a pointer to the pnode on success or a negative

 * error code on failure.

 */

struct ubifs_pnode *ubifs_pnode_lookup(struct ubifs_info *c, int i)

{

	int err, h, iip, shft;

	struct ubifs_nnode *nnode;



	if (!c->nroot) {

		err = ubifs_read_nnode(c, NULL, 0);

		if (err)

			return ERR_PTR(err);

	}

	i <<= UBIFS_LPT_FANOUT_SHIFT;

	nnode = c->nroot;

	shft = c->lpt_hght * UBIFS_LPT_FANOUT_SHIFT;

	for (h = 1; h < c->lpt_hght; h++) {

		iip = ((i >> shft) & (UBIFS_LPT_FANOUT - 1));

		shft -= UBIFS_LPT_FANOUT_SHIFT;

		nnode = ubifs_get_nnode(c, nnode, iip);

		if (IS_ERR(nnode))

			return ERR_CAST(nnode);

	}

	iip = ((i >> shft) & (UBIFS_LPT_FANOUT - 1));

	return ubifs_get_pnode(c, nnode, iip);

}



/**

 * ubifs_lpt_lookup - lookup LEB properties in the LPT.

 * @c: UBIFS file-system description object

fs/ubifs/lpt_commit.c

+4 −36
Original line number Diff line number Diff line
@@ -618,38 +618,6 @@ static struct ubifs_pnode *next_pnode_to_dirty(struct ubifs_info *c, 
	return ubifs_get_pnode(c, nnode, iip);

}



/**

 * pnode_lookup - lookup a pnode in the LPT.

 * @c: UBIFS file-system description object

 * @i: pnode number (0 to (main_lebs - 1) / UBIFS_LPT_FANOUT))

 *

 * This function returns a pointer to the pnode on success or a negative

 * error code on failure.

 */

static struct ubifs_pnode *pnode_lookup(struct ubifs_info *c, int i)

{

	int err, h, iip, shft;

	struct ubifs_nnode *nnode;



	if (!c->nroot) {

		err = ubifs_read_nnode(c, NULL, 0);

		if (err)

			return ERR_PTR(err);

	}

	i <<= UBIFS_LPT_FANOUT_SHIFT;

	nnode = c->nroot;

	shft = c->lpt_hght * UBIFS_LPT_FANOUT_SHIFT;

	for (h = 1; h < c->lpt_hght; h++) {

		iip = ((i >> shft) & (UBIFS_LPT_FANOUT - 1));

		shft -= UBIFS_LPT_FANOUT_SHIFT;

		nnode = ubifs_get_nnode(c, nnode, iip);

		if (IS_ERR(nnode))

			return ERR_CAST(nnode);

	}

	iip = ((i >> shft) & (UBIFS_LPT_FANOUT - 1));

	return ubifs_get_pnode(c, nnode, iip);

}



/**

 * add_pnode_dirt - add dirty space to LPT LEB properties.

 * @c: UBIFS file-system description object
@@ -702,7 +670,7 @@ static int make_tree_dirty(struct ubifs_info *c) 
{

	struct ubifs_pnode *pnode;



	pnode = pnode_lookup(c, 0);

	pnode = ubifs_pnode_lookup(c, 0);

	if (IS_ERR(pnode))

		return PTR_ERR(pnode);
@@ -956,7 +924,7 @@ static int make_pnode_dirty(struct ubifs_info *c, int node_num, int lnum, 
	struct ubifs_pnode *pnode;

	struct ubifs_nbranch *branch;



	pnode = pnode_lookup(c, node_num);

	pnode = ubifs_pnode_lookup(c, node_num);

	if (IS_ERR(pnode))

		return PTR_ERR(pnode);

	branch = &pnode->parent->nbranch[pnode->iip];
@@ -1558,7 +1526,7 @@ static int dbg_is_pnode_dirty(struct ubifs_info *c, int lnum, int offs) 
		struct ubifs_nbranch *branch;



		cond_resched();

		pnode = pnode_lookup(c, i);

		pnode = ubifs_pnode_lookup(c, i);

		if (IS_ERR(pnode))

			return PTR_ERR(pnode);

		branch = &pnode->parent->nbranch[pnode->iip];
@@ -1710,7 +1678,7 @@ int dbg_check_ltab(struct ubifs_info *c) 
	for (i = 0; i < cnt; i++) {

		struct ubifs_pnode *pnode;



		pnode = pnode_lookup(c, i);

		pnode = ubifs_pnode_lookup(c, i);

		if (IS_ERR(pnode))

			return PTR_ERR(pnode);

		cond_resched();

fs/ubifs/ubifs.h

+1 −0
Original line number Diff line number Diff line
@@ -1712,6 +1712,7 @@ struct ubifs_pnode *ubifs_get_pnode(struct ubifs_info *c, 
				    struct ubifs_nnode *parent, int iip);

struct ubifs_nnode *ubifs_get_nnode(struct ubifs_info *c,

				    struct ubifs_nnode *parent, int iip);

struct ubifs_pnode *ubifs_pnode_lookup(struct ubifs_info *c, int i);

int ubifs_read_nnode(struct ubifs_info *c, struct ubifs_nnode *parent, int iip);

void ubifs_add_lpt_dirt(struct ubifs_info *c, int lnum, int dirty);

void ubifs_add_nnode_dirt(struct ubifs_info *c, struct ubifs_nnode *nnode);