vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Change fs functions to add fs_ prefix

Browse source 
This avoid conflict with gnulib

Signed-off-by: Vladimir Serbinenko <phcoder@google.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Vladimir Serbinenko 2019-04-08 07:24:24 +02:00 • committed by Vincent Batts
parent 08452decc8
commit afeb7b4bd9
55 changed files with 260 additions and 259 deletions
Download patch file Download diff file Expand all files Collapse all files

6
util/setup.c
View file

@ -491,7 +491,7 @@ SETUP (const char *dir,
goto unable_to_embed;
}
if (fs && !fs->embed)
if (fs && !fs->fs_embed)
{
grub_util_warn (_("File system `%s' doesn't support embedding"),
fs->name);
@ -529,8 +529,8 @@ SETUP (const char *dir,
err = ctx.dest_partmap->embed (dest_dev->disk, &nsec, maxsec,
GRUB_EMBED_PCBIOS, &sectors);
else
err = fs->embed (dest_dev, &nsec, maxsec,
GRUB_EMBED_PCBIOS, &sectors);
err = fs->fs_embed (dest_dev, &nsec, maxsec,
GRUB_EMBED_PCBIOS, &sectors);
if (!err && nsec < core_sectors)
{
err = grub_error (GRUB_ERR_OUT_OF_RANGE,