mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git
synced 2024-12-01 16:14:20 +08:00
btrfs-progs: fix find_mount_root() to handle duplicated mount point correctly
Original find_mount_root() will use the first mount point match and
return it.
It was OK until the following commit, which will also check the fstype:
de22c28ef3
btrfs-progs: Check fstype in find_mount_root()
With fstype check, we should check the last match, not only the first
one.
Or the following mount will not pass the find_mount_root():
/dev/sdc on /mnt/test type ext4 (rw,relatime,data=ordered)
/dev/sdb on /mnt/test type btrfs (rw,relatime,space_cache)
This patch will use the last match to do the fstype check.
Reported-by: Remco Hosman <remco@yerf-it.nl>
Signed-off-by: Remco Hosman <remco@yerf-it.nl>
Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
Reviewed-by: Omar Sandoval <osandov@osandov.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
This commit is contained in:
parent
24f5a651d9
commit
6a47725a6f
4
utils.c
4
utils.c
@ -2359,8 +2359,8 @@ int find_mount_root(const char *path, char **mount_root)
|
||||
while ((ent = getmntent(mnttab))) {
|
||||
len = strlen(ent->mnt_dir);
|
||||
if (strncmp(ent->mnt_dir, path, len) == 0) {
|
||||
/* match found */
|
||||
if (longest_matchlen < len) {
|
||||
/* match found and use the latest match */
|
||||
if (longest_matchlen <= len) {
|
||||
free(longest_match);
|
||||
longest_matchlen = len;
|
||||
longest_match = strdup(ent->mnt_dir);
|
||||
|
Loading…
Reference in New Issue
Block a user