diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2012-06-12 19:49:19 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2012-06-12 19:49:19 -0700 |
| commit | c64fb805ca8bdcc96528f55ef28dcb0cd5c39c20 (patch) | |
| tree | a3939845d967199a6e9f7482b5646791f76f1b71 /core/fs/btrfs/btrfs.c | |
| parent | e7bd19def830e8341b1a100956345f1028740b9e (diff) | |
| parent | 753ab4bde224205876f09889ce928acb3682ba73 (diff) | |
| download | syslinux-c64fb805ca8bdcc96528f55ef28dcb0cd5c39c20.tar.gz | |
Merge remote-tracking branch 'origin/master' into elflinksyslinux-5.00-pre3
Diffstat (limited to 'core/fs/btrfs/btrfs.c')
| -rw-r--r-- | core/fs/btrfs/btrfs.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/fs/btrfs/btrfs.c b/core/fs/btrfs/btrfs.c index 8dedf8ac..16386cc0 100644 --- a/core/fs/btrfs/btrfs.c +++ b/core/fs/btrfs/btrfs.c @@ -602,12 +602,15 @@ static void btrfs_get_fs_tree(struct fs_info *fs) do { do { struct btrfs_root_ref *ref; + int pathlen; if (btrfs_comp_keys_type(&search_key, &path.item.key)) break; ref = (struct btrfs_root_ref *)path.data; - if (!strcmp((char*)(ref + 1), SubvolName)) { + pathlen = path.item.size - sizeof(struct btrfs_root_ref); + + if (!strncmp((char*)(ref + 1), SubvolName, pathlen)) { subvol_ok = true; break; } |