ANDROID: mnt: Fix next_descendent
next_descendent did not properly handle the case where the initial mount had no slaves. In this case, we would look for the next slave, but since don't have a master, the check for wrapping around to the start of the list will always fail. Instead, we check for this case, and ensure that we end the iteration when we come back to the root. Signed-off-by: Daniel Rosenberg <drosen@google.com> Bug: 62094374 Change-Id: I43dfcee041aa3730cb4b9a1161418974ef84812e Signed-off-by: Kevin F. Haggerty <haggertk@lineageos.org>
This commit is contained in:
parent
d511e47b6b
commit
08507c5de7
11
fs/pnode.c
11
fs/pnode.c
|
@ -405,9 +405,14 @@ static struct mount *next_descendent(struct mount *root, struct mount *cur)
|
|||
if (!IS_MNT_NEW(cur) && !list_empty(&cur->mnt_slave_list))
|
||||
return first_slave(cur);
|
||||
do {
|
||||
if (cur->mnt_slave.next != &cur->mnt_master->mnt_slave_list)
|
||||
return next_slave(cur);
|
||||
cur = cur->mnt_master;
|
||||
struct mount *master = cur->mnt_master;
|
||||
|
||||
if (!master || cur->mnt_slave.next != &master->mnt_slave_list) {
|
||||
struct mount *next = next_slave(cur);
|
||||
|
||||
return (next == root) ? NULL : next;
|
||||
}
|
||||
cur = master;
|
||||
} while (cur != root);
|
||||
return NULL;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue