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

Commit 761e29f3 authored by Adrian Hunter's avatar Adrian Hunter Committed by Artem Bityutskiy
Browse files

UBIFS: always read hashed-key nodes under TNC mutex 



Leaf-nodes that have a hashed key are stored in the
leaf-node-cache (LNC) which is protected by the TNC
mutex.  Consequently, when reading a leaf node with
a hashed key (i.e. directory entries, xattr entries)
the TNC mutex is always required.

Signed-off-by: default avatarAdrian Hunter <ext-adrian.hunter@nokia.com>
parent 04da11bf

fs/ubifs/tnc.c

+1 −6
Original line number Diff line number Diff line
@@ -1498,7 +1498,6 @@ static int do_lookup_nm(struct ubifs_info *c, const union ubifs_key *key, 
{

	int found, n, err;

	struct ubifs_znode *znode;

	struct ubifs_zbranch zbr;



	dbg_tnc("name '%.*s' key %s", nm->len, nm->name, DBGKEY(key));

	mutex_lock(&c->tnc_mutex);
@@ -1522,11 +1521,7 @@ static int do_lookup_nm(struct ubifs_info *c, const union ubifs_key *key, 
		goto out_unlock;

	}



	zbr = znode->zbranch[n];

	mutex_unlock(&c->tnc_mutex);



	err = tnc_read_node_nm(c, &zbr, node);

	return err;

	err = tnc_read_node_nm(c, &znode->zbranch[n], node);



out_unlock:

	mutex_unlock(&c->tnc_mutex);