leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ubifs: Fix journal replay wrt. xattr nodes

Browse Source 
Backport commit 1cb51a15b576 ("ubifs: Fix journal replay wrt. xattr
nodes") from the Linux Kernel, which has the following Signed-off-by
line:
Signed-off-by: Richard Weinberger <richard@nod.at>

For U-Boot, after comapring with the upstream commit:
Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Ville Baillie 2022-03-28 09:13:43 +00:00 committed by Tom Rini
parent b583348ca8
commit 749c6a6275
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fs/ubifs/tnc.c
View File

@ -50,6 +50,11 @@ enum {
NOT_ON_MEDIA = 3, NOT_ON_MEDIA = 3,
}; };
static int try_read_node(const struct ubifs_info *c, void *buf, int type,
int len, int lnum, int offs);
static int fallible_read_node(struct ubifs_info *c, const union ubifs_key *key,
struct ubifs_zbranch *zbr, void *node);
/** /**
* insert_old_idx - record an index node obsoleted since the last commit start. * insert_old_idx - record an index node obsoleted since the last commit start.
* @c: UBIFS file-system description object * @c: UBIFS file-system description object
@ -402,7 +407,19 @@ static int tnc_read_node_nm(struct ubifs_info *c, struct ubifs_zbranch *zbr,
return 0; return 0;
} }
if (c->replaying) {
err = fallible_read_node(c, &zbr->key, zbr, node);
/*
* When the node was not found, return -ENOENT, 0 otherwise.
* Negative return codes stay as-is.
*/
if (err == 0)
err = -ENOENT;
else if (err == 1)
err = 0;
} else {
err = ubifs_tnc_read_node(c, zbr, node); err = ubifs_tnc_read_node(c, zbr, node);
}
if (err) if (err)
return err; return err;
@ -2770,6 +2787,10 @@ struct ubifs_dent_node *ubifs_tnc_next_ent(struct ubifs_info *c,
if (nm->name) { if (nm->name) {
if (err) { if (err) {
/* Handle collisions */ /* Handle collisions */
if (c->replaying)
err = fallible_resolve_collision(c, key, &znode, &n,
nm, 0);
else
err = resolve_collision(c, key, &znode, &n, nm); err = resolve_collision(c, key, &znode, &n, nm);
dbg_tnc("rc returned %d, znode %p, n %d", dbg_tnc("rc returned %d, znode %p, n %d",
err, znode, n); err, znode, n);