[syslinux:pathbased] btrfs: use generic_load_config
syslinux-bot for H. Peter Anvin
hpa at zytor.com
Mon Feb 15 22:48:04 PST 2010
Commit-ID: e8bbf944a136b84fb3a1061dc7565d04703d06e7
Gitweb: http://syslinux.zytor.com/commit/e8bbf944a136b84fb3a1061dc7565d04703d06e7
Author: H. Peter Anvin <hpa at zytor.com>
AuthorDate: Mon, 15 Feb 2010 22:47:17 -0800
Committer: H. Peter Anvin <hpa at zytor.com>
CommitDate: Mon, 15 Feb 2010 22:47:17 -0800
btrfs: use generic_load_config
btrfs can use generic_load_config, so use it.
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
---
core/fs/btrfs/btrfs.c | 17 +----------------
1 files changed, 1 insertions(+), 16 deletions(-)
diff --git a/core/fs/btrfs/btrfs.c b/core/fs/btrfs/btrfs.c
index ee04260..853287e 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(®s, 0, sizeof regs);
- regs.edi.w[0] = OFFS_WRT(ConfigName, 0);
- call16(core_open, ®s, ®s);
-
- 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
};
More information about the Syslinux-commits
mailing list