aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ubifs
diff options
context:
space:
mode:
authorRichard Weinberger <richard@nod.at>2016-10-10 04:14:40 -0400
committerRichard Weinberger <richard@nod.at>2016-12-12 17:07:38 -0500
commitb91dc9816e5cd684b0d131fe6ec608a99bfbe3ee (patch)
tree6a65acbce1ab56ef39f666556f160866701f60d2 /fs/ubifs
parentca7f85be8d6cf9ad1b6597e5d907ddbe392082a9 (diff)
ubifs: Rename tnc_read_node_nm
tnc_read_hashed_node() is a better name since we read a node by a given hash, not a name. Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'fs/ubifs')
-rw-r--r--fs/ubifs/tnc.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c
index 0d0030461cb4..0d751297873e 100644
--- a/fs/ubifs/tnc.c
+++ b/fs/ubifs/tnc.c
@@ -378,7 +378,7 @@ static void lnc_free(struct ubifs_zbranch *zbr)
378} 378}
379 379
380/** 380/**
381 * tnc_read_node_nm - read a "hashed" leaf node. 381 * tnc_read_hashed_node - read a "hashed" leaf node.
382 * @c: UBIFS file-system description object 382 * @c: UBIFS file-system description object
383 * @zbr: key and position of the node 383 * @zbr: key and position of the node
384 * @node: node is returned here 384 * @node: node is returned here
@@ -388,8 +388,8 @@ static void lnc_free(struct ubifs_zbranch *zbr)
388 * added to LNC. Returns zero in case of success or a negative negative error 388 * added to LNC. Returns zero in case of success or a negative negative error
389 * code in case of failure. 389 * code in case of failure.
390 */ 390 */
391static int tnc_read_node_nm(struct ubifs_info *c, struct ubifs_zbranch *zbr, 391static int tnc_read_hashed_node(struct ubifs_info *c, struct ubifs_zbranch *zbr,
392 void *node) 392 void *node)
393{ 393{
394 int err; 394 int err;
395 395
@@ -1454,7 +1454,7 @@ again:
1454 * In this case the leaf node cache gets used, so we pass the 1454 * In this case the leaf node cache gets used, so we pass the
1455 * address of the zbranch and keep the mutex locked 1455 * address of the zbranch and keep the mutex locked
1456 */ 1456 */
1457 err = tnc_read_node_nm(c, zt, node); 1457 err = tnc_read_hashed_node(c, zt, node);
1458 goto out; 1458 goto out;
1459 } 1459 }
1460 if (safely) { 1460 if (safely) {
@@ -1817,7 +1817,7 @@ static int do_lookup_nm(struct ubifs_info *c, const union ubifs_key *key,
1817 goto out_unlock; 1817 goto out_unlock;
1818 } 1818 }
1819 1819
1820 err = tnc_read_node_nm(c, &znode->zbranch[n], node); 1820 err = tnc_read_hashed_node(c, &znode->zbranch[n], node);
1821 1821
1822out_unlock: 1822out_unlock:
1823 mutex_unlock(&c->tnc_mutex); 1823 mutex_unlock(&c->tnc_mutex);
@@ -2815,7 +2815,7 @@ struct ubifs_dent_node *ubifs_tnc_next_ent(struct ubifs_info *c,
2815 goto out_free; 2815 goto out_free;
2816 } 2816 }
2817 2817
2818 err = tnc_read_node_nm(c, zbr, dent); 2818 err = tnc_read_hashed_node(c, zbr, dent);
2819 if (unlikely(err)) 2819 if (unlikely(err))
2820 goto out_free; 2820 goto out_free;
2821 2821