From: Sascha Hauer <s.hauer@pengutronix.de>
To: linux-mtd@lists.infradead.org
Cc: David Gstir <david@sigma-star.at>,
Richard Weinberger <richard@nod.at>,
kernel@pengutronix.de, linux-kernel@vger.kernel.org,
Sascha Hauer <s.hauer@pengutronix.de>
Subject: [PATCH 05/25] ubifs: export pnode_lookup as ubifs_pnode_lookup
Date: Fri, 7 Sep 2018 14:36:26 +0200 [thread overview]
Message-ID: <20180907123646.12688-6-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20180907123646.12688-1-s.hauer@pengutronix.de>
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: Sascha Hauer <s.hauer@pengutronix.de>
---
fs/ubifs/lpt.c | 32 ++++++++++++++++++++++++++++++++
fs/ubifs/lpt_commit.c | 40 ++++------------------------------------
fs/ubifs/ubifs.h | 1 +
3 files changed, 37 insertions(+), 36 deletions(-)
diff --git a/fs/ubifs/lpt.c b/fs/ubifs/lpt.c
index 31393370e334..ed0c67fe7500 100644
--- a/fs/ubifs/lpt.c
+++ b/fs/ubifs/lpt.c
@@ -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
diff --git a/fs/ubifs/lpt_commit.c b/fs/ubifs/lpt_commit.c
index 7ce30994bbba..62d6a87d4f5d 100644
--- a/fs/ubifs/lpt_commit.c
+++ b/fs/ubifs/lpt_commit.c
@@ -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();
diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h
index 4368cde476b0..306cc7a4f725 100644
--- a/fs/ubifs/ubifs.h
+++ b/fs/ubifs/ubifs.h
@@ -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);
--
2.18.0
next prev parent reply other threads:[~2018-09-07 12:40 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-07 12:36 [PATCH v2 00/25] UBIFS authentication support Sascha Hauer
2018-09-07 12:36 ` [PATCH 01/25] ARM: imx_v6_v7_defconfig: update Sascha Hauer
2018-09-07 12:36 ` [PATCH 02/25] ubifs: refactor create_default_filesystem() Sascha Hauer
2018-09-07 12:36 ` [PATCH 03/25] ubifs: pass ubifs_zbranch to try_read_node() Sascha Hauer
2018-09-07 12:36 ` [PATCH 04/25] ubifs: pass ubifs_zbranch to read_znode() Sascha Hauer
2018-09-07 12:36 ` Sascha Hauer [this message]
2018-09-07 12:36 ` [PATCH 06/25] ubifs: implement ubifs_lpt_lookup using ubifs_pnode_lookup Sascha Hauer
2018-09-07 12:36 ` [PATCH 07/25] ubifs: drop write_node Sascha Hauer
2018-09-07 12:36 ` [PATCH 08/25] ubifs: Store read superblock node Sascha Hauer
2018-09-07 12:36 ` [PATCH 09/25] ubifs: Format changes for authentication support Sascha Hauer
2018-09-07 12:36 ` [PATCH 10/25] ubifs: add separate functions to init/crc a node Sascha Hauer
2018-09-07 12:36 ` [PATCH 11/25] ubifs: add helper functions for authentication support Sascha Hauer
2018-09-07 12:36 ` [PATCH 12/25] ubifs: Create functions to embed a HMAC in a node Sascha Hauer
2018-09-07 12:36 ` [PATCH 13/25] ubifs: Add hashes to the tree node cache Sascha Hauer
2018-09-07 12:36 ` [PATCH 14/25] ubifs: authentication: Add hashes to index nodes Sascha Hauer
2018-09-07 12:36 ` [PATCH 15/25] ubifs: Add authentication nodes to journal Sascha Hauer
2018-09-07 12:36 ` [PATCH 16/25] ubifs: Add auth nodes to garbage collector journal head Sascha Hauer
2018-09-07 12:36 ` [PATCH 17/25] ubifs: authenticate replayed journal Sascha Hauer
2018-09-07 12:36 ` [PATCH 18/25] ubifs: authentication: authenticate LPT Sascha Hauer
2018-09-07 12:36 ` [PATCH 19/25] ubfis: authentication: authenticate master node Sascha Hauer
2018-09-07 12:36 ` [PATCH 20/25] ubifs: Create hash for default LPT Sascha Hauer
2018-09-07 12:36 ` [PATCH 21/25] ubifs: authentication: Authenticate super block node Sascha Hauer
2018-09-07 12:36 ` [PATCH 22/25] ubifs: Add hashes and HMACs to default filesystem Sascha Hauer
2018-09-07 12:36 ` [PATCH 23/25] ubifs: do not update inode size in-place in authenticated mode Sascha Hauer
2018-09-07 12:36 ` [PATCH 24/25] ubifs: Enable authentication support Sascha Hauer
2018-09-07 12:36 ` [PATCH 25/25] Documentation: ubifs: Add authentication whitepaper Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180907123646.12688-6-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=david@sigma-star.at \
--cc=kernel@pengutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=richard@nod.at \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).