aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-02-15 22:47:17 -0800
committerH. Peter Anvin <hpa@zytor.com>2010-02-15 22:47:17 -0800
commite8bbf944a136b84fb3a1061dc7565d04703d06e7 (patch)
tree1913f55dc74f8ca1b1cfb647442c9cf1b7f27df6
parentc0fbd21bef3f781cec554595455e123ba58b939b (diff)
downloadsyslinux.git-e8bbf944a136b84fb3a1061dc7565d04703d06e7.tar.gz
syslinux.git-e8bbf944a136b84fb3a1061dc7565d04703d06e7.tar.xz
syslinux.git-e8bbf944a136b84fb3a1061dc7565d04703d06e7.zip
btrfs: use generic_load_configsyslinux-4.00-pre22
btrfs can use generic_load_config, so use it. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rw-r--r--core/fs/btrfs/btrfs.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/core/fs/btrfs/btrfs.c b/core/fs/btrfs/btrfs.c
index ee042601..853287e5 100644
--- a/core/fs/btrfs/btrfs.c
+++ b/core/fs/btrfs/btrfs.c
@@ -610,21 +610,6 @@ static void btrfs_searchdir(char *filename, struct file *file)
btrfs_set_cwd();
}
-/* Load the config file, return 1 if failed, or 0 */
-static int btrfs_load_config(void)
-{
- char *config_name = "extlinux.conf";/* use same config name as ext2 too? */
- com32sys_t regs;
-
- strcpy(ConfigName, config_name);
-
- memset(&regs, 0, sizeof regs);
- regs.edi.w[0] = OFFS_WRT(ConfigName, 0);
- call16(core_open, &regs, &regs);
-
- return !!(regs.eflags.l & EFLAGS_ZF);
-}
-
static uint32_t btrfs_getfssec(struct file *gfile, char *buf, int sectors,
bool *have_more)
{
@@ -729,5 +714,5 @@ const struct fs_ops btrfs_fs_ops = {
.close_file = btrfs_close_file,
.mangle_name = generic_mangle_name,
.unmangle_name = generic_unmangle_name,
- .load_config = btrfs_load_config
+ .load_config = generic_load_config
};