From: Sascha Hauer <s.hauer@pengutronix.de>
To: linux-fsdevel@vger.kernel.org
Cc: linux-mtd@lists.infradead.org, Jan Kara <jack@suse.com>,
Richard Weinberger <richard@nod.at>,
kernel@pengutronix.de, Sascha Hauer <s.hauer@pengutronix.de>
Subject: [PATCH 6/7] ubifs: export get_znode
Date: Wed, 6 Nov 2019 10:15:36 +0100 [thread overview]
Message-ID: <20191106091537.32480-7-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20191106091537.32480-1-s.hauer@pengutronix.de>
get_znode will be needed by upcoming UBIFS quota support. Rename it to
ubifs_get_znode and export it.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
fs/ubifs/tnc.c | 32 ++++++++++++++++----------------
fs/ubifs/ubifs.h | 2 ++
2 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c
index e8e7b0e9532e..188fa036e655 100644
--- a/fs/ubifs/tnc.c
+++ b/fs/ubifs/tnc.c
@@ -571,15 +571,15 @@ static int matches_name(struct ubifs_info *c, struct ubifs_zbranch *zbr,
}
/**
- * get_znode - get a TNC znode that may not be loaded yet.
+ * ubifs_get_znode - get a TNC znode that may not be loaded yet.
* @c: UBIFS file-system description object
* @znode: parent znode
* @n: znode branch slot number
*
* This function returns the znode or a negative error code.
*/
-static struct ubifs_znode *get_znode(struct ubifs_info *c,
- struct ubifs_znode *znode, int n)
+struct ubifs_znode *ubifs_get_znode(struct ubifs_info *c,
+ struct ubifs_znode *znode, int n)
{
struct ubifs_zbranch *zbr;
@@ -619,11 +619,11 @@ static int tnc_next(struct ubifs_info *c, struct ubifs_znode **zn, int *n)
nn = znode->iip + 1;
znode = zp;
if (nn < znode->child_cnt) {
- znode = get_znode(c, znode, nn);
+ znode = ubifs_get_znode(c, znode, nn);
if (IS_ERR(znode))
return PTR_ERR(znode);
while (znode->level != 0) {
- znode = get_znode(c, znode, 0);
+ znode = ubifs_get_znode(c, znode, 0);
if (IS_ERR(znode))
return PTR_ERR(znode);
}
@@ -663,12 +663,12 @@ static int tnc_prev(struct ubifs_info *c, struct ubifs_znode **zn, int *n)
nn = znode->iip - 1;
znode = zp;
if (nn >= 0) {
- znode = get_znode(c, znode, nn);
+ znode = ubifs_get_znode(c, znode, nn);
if (IS_ERR(znode))
return PTR_ERR(znode);
while (znode->level != 0) {
nn = znode->child_cnt - 1;
- znode = get_znode(c, znode, nn);
+ znode = ubifs_get_znode(c, znode, nn);
if (IS_ERR(znode))
return PTR_ERR(znode);
}
@@ -2572,7 +2572,7 @@ static int tnc_delete(struct ubifs_info *c, struct ubifs_znode *znode, int n)
while (znode->child_cnt == 1 && znode->level != 0) {
zp = znode;
zbr = &znode->zbranch[0];
- znode = get_znode(c, znode, 0);
+ znode = ubifs_get_znode(c, znode, 0);
if (IS_ERR(znode))
return PTR_ERR(znode);
znode = dirty_cow_znode(c, zbr);
@@ -3096,12 +3096,12 @@ static struct ubifs_znode *left_znode(struct ubifs_info *c,
return NULL;
if (n >= 0) {
/* Now go down the rightmost branch to 'level' */
- znode = get_znode(c, znode, n);
+ znode = ubifs_get_znode(c, znode, n);
if (IS_ERR(znode))
return znode;
while (znode->level != level) {
n = znode->child_cnt - 1;
- znode = get_znode(c, znode, n);
+ znode = ubifs_get_znode(c, znode, n);
if (IS_ERR(znode))
return znode;
}
@@ -3133,11 +3133,11 @@ static struct ubifs_znode *right_znode(struct ubifs_info *c,
return NULL;
if (n < znode->child_cnt) {
/* Now go down the leftmost branch to 'level' */
- znode = get_znode(c, znode, n);
+ znode = ubifs_get_znode(c, znode, n);
if (IS_ERR(znode))
return znode;
while (znode->level != level) {
- znode = get_znode(c, znode, 0);
+ znode = ubifs_get_znode(c, znode, 0);
if (IS_ERR(znode))
return znode;
}
@@ -3222,13 +3222,13 @@ static struct ubifs_znode *lookup_znode(struct ubifs_info *c,
}
if (znode->level == level + 1)
break;
- znode = get_znode(c, znode, n);
+ znode = ubifs_get_znode(c, znode, n);
if (IS_ERR(znode))
return znode;
}
/* Check if the child is the one we are looking for */
if (znode->zbranch[n].lnum == lnum && znode->zbranch[n].offs == offs)
- return get_znode(c, znode, n);
+ return ubifs_get_znode(c, znode, n);
/* If the key is unique, there is nowhere else to look */
if (!is_hash_key(c, key))
return NULL;
@@ -3254,7 +3254,7 @@ static struct ubifs_znode *lookup_znode(struct ubifs_info *c,
/* Check it */
if (znode->zbranch[n].lnum == lnum &&
znode->zbranch[n].offs == offs)
- return get_znode(c, znode, n);
+ return ubifs_get_znode(c, znode, n);
/* Stop if the key is less than the one we are looking for */
if (keys_cmp(c, &znode->zbranch[n].key, key) < 0)
break;
@@ -3276,7 +3276,7 @@ static struct ubifs_znode *lookup_znode(struct ubifs_info *c,
/* Check it */
if (znode->zbranch[n].lnum == lnum &&
znode->zbranch[n].offs == offs)
- return get_znode(c, znode, n);
+ return ubifs_get_znode(c, znode, n);
/* Stop if the key is greater than the one we are looking for */
if (keys_cmp(c, &znode->zbranch[n].key, key) > 0)
break;
diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h
index 3f8a33fca67b..fd9e52749ef7 100644
--- a/fs/ubifs/ubifs.h
+++ b/fs/ubifs/ubifs.h
@@ -1819,6 +1819,8 @@ int ubifs_find_dirty_idx_leb(struct ubifs_info *c);
int ubifs_save_dirty_idx_lnums(struct ubifs_info *c);
/* tnc.c */
+struct ubifs_znode *ubifs_get_znode(struct ubifs_info *c,
+ struct ubifs_znode *znode, int n);
int ubifs_lookup_level0(struct ubifs_info *c, const union ubifs_key *key,
struct ubifs_znode **zn, int *n);
int ubifs_tnc_lookup_nm(struct ubifs_info *c, const union ubifs_key *key,
--
2.24.0.rc1
next prev parent reply other threads:[~2019-11-06 9:16 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-06 9:15 [PATCH v3 0/7] Add quota support to UBIFS Sascha Hauer
2019-11-06 9:15 ` [PATCH 1/7] quota: Allow to pass mount path to quotactl Sascha Hauer
2019-11-06 10:05 ` Jan Kara
2019-11-06 10:15 ` Sascha Hauer
2019-11-06 9:15 ` [PATCH 2/7] ubifs: move checks and preparation into setflags() Sascha Hauer
2020-01-19 19:56 ` Richard Weinberger
2019-11-06 9:15 ` [PATCH 3/7] ubifs: Add support for FS_IOC_FS[SG]ETXATTR ioctls Sascha Hauer
2020-01-19 19:55 ` Richard Weinberger
2019-11-06 9:15 ` [PATCH 4/7] ubifs: do not ubifs_inode() on potentially NULL pointer Sascha Hauer
2020-01-19 19:58 ` Richard Weinberger
2019-11-06 9:15 ` [PATCH 5/7] ubifs: Add support for project id Sascha Hauer
2020-01-19 20:09 ` Richard Weinberger
2020-01-24 8:05 ` Sascha Hauer
2019-11-06 9:15 ` Sascha Hauer [this message]
2019-11-06 9:15 ` [PATCH 7/7] ubifs: Add quota support Sascha Hauer
2019-11-06 10:14 ` Jan Kara
2019-11-11 8:57 ` Sascha Hauer
2019-11-11 16:34 ` Jan Kara
2019-11-12 8:59 ` Sascha Hauer
2019-11-12 9:31 ` Jan Kara
2019-11-08 14:47 ` kbuild test robot
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=20191106091537.32480-7-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=jack@suse.com \
--cc=kernel@pengutronix.de \
--cc=linux-fsdevel@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).