diff options
| author | Adrian Hunter <ext-adrian.hunter@nokia.com> | 2008-08-20 15:32:40 +0200 |
|---|---|---|
| committer | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2008-08-25 13:33:41 +0200 |
| commit | 761e29f3bb19b05bea55285dfdf2d28e001a63b8 (patch) | |
| tree | 36acaae9cbcca6f613c03e29f7e7fe61bb4f243b /fs | |
| parent | UBIFS: fix zero-length truncations (diff) | |
| download | linux-761e29f3bb19b05bea55285dfdf2d28e001a63b8.tar.xz linux-761e29f3bb19b05bea55285dfdf2d28e001a63b8.zip | |
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: Adrian Hunter <ext-adrian.hunter@nokia.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ubifs/tnc.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c index e909f4a96443..4fbc5921688f 100644 --- a/fs/ubifs/tnc.c +++ b/fs/ubifs/tnc.c @@ -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); |