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

2009-05-05 Pavel Roskin <proski@gnu.org>

Browse source 
* include/grub/dl.h [GRUB_UTIL]: Provide inline implementations
	of grub_dl_ref() and grub_dl_unref().
	* commands/parttool.c: Remove preprocessor conditionals around
	grub_dl_ref() and grub_dl_unref().
	* fs/affs.c: Likewise.
	* fs/afs.c: Likewise.
	* fs/cpio.c: Likewise.
	* fs/ext2.c: Likewise.
	* fs/fat.c: Likewise.
	* fs/hfs.c: Likewise.
	* fs/hfsplus.c: Likewise.
	* fs/iso9660.c: Likewise.
	* fs/jfs.c: Likewise.
	* fs/minix.c: Likewise.
	* fs/ntfs.c: Likewise.
	* fs/reiserfs.c: Likewise.
	* fs/sfs.c: Likewise.
	* fs/udf.c: Likewise.
	* fs/ufs.c: Likewise.
	* fs/xfs.c: Likewise.
	* include/grub/dl.h: Likewise.
	* loader/xnu.c: Likewise.
This commit is contained in:
proski 2009-05-05 16:36:58 +00:00
parent de5fd76e95
commit 119494b506
20 changed files with 41 additions and 282 deletions
Download patch file Download diff file Expand all files Collapse all files

26
fs/ext2.c
View file

@ -317,9 +317,7 @@ struct grub_ext2_data
struct grub_fshelp_node diropen;
};
#ifndef GRUB_UTIL
static grub_dl_t my_mod;
#endif
@ -725,9 +723,7 @@ grub_ext2_open (struct grub_file *file, const char *name)
struct grub_ext2_data *data;
struct grub_fshelp_node *fdiro = 0;
#ifndef GRUB_UTIL
grub_dl_ref (my_mod);
#endif
data = grub_ext2_mount (file->device->disk);
if (! data)
@ -759,9 +755,7 @@ grub_ext2_open (struct grub_file *file, const char *name)
grub_free (fdiro);
grub_free (data);
#ifndef GRUB_UTIL
grub_dl_unref (my_mod);
#endif
return grub_errno;
}
@ -771,9 +765,7 @@ grub_ext2_close (grub_file_t file)
{
grub_free (file->data);
#ifndef GRUB_UTIL
grub_dl_unref (my_mod);
#endif
return GRUB_ERR_NONE;
}
@ -825,9 +817,7 @@ grub_ext2_dir (grub_device_t device, const char *path,
return hook (filename, &info);
}
#ifndef GRUB_UTIL
grub_dl_ref (my_mod);
#endif
data = grub_ext2_mount (device->disk);
if (! data)
@ -845,9 +835,7 @@ grub_ext2_dir (grub_device_t device, const char *path,
grub_free (fdiro);
grub_free (data);
#ifndef GRUB_UTIL
grub_dl_unref (my_mod);
#endif
return grub_errno;
}
@ -858,9 +846,7 @@ grub_ext2_label (grub_device_t device, char **label)
struct grub_ext2_data *data;
grub_disk_t disk = device->disk;
#ifndef GRUB_UTIL
grub_dl_ref (my_mod);
#endif
data = grub_ext2_mount (disk);
if (data)
@ -868,9 +854,7 @@ grub_ext2_label (grub_device_t device, char **label)
else
*label = NULL;
#ifndef GRUB_UTIL
grub_dl_unref (my_mod);
#endif
grub_free (data);
@ -883,9 +867,7 @@ grub_ext2_uuid (grub_device_t device, char **uuid)
struct grub_ext2_data *data;
grub_disk_t disk = device->disk;
#ifndef GRUB_UTIL
grub_dl_ref (my_mod);
#endif
data = grub_ext2_mount (disk);
if (data)
@ -900,9 +882,7 @@ grub_ext2_uuid (grub_device_t device, char **uuid)
else
*uuid = NULL;
#ifndef GRUB_UTIL
grub_dl_unref (my_mod);
#endif
grub_free (data);
@ -916,9 +896,7 @@ grub_ext2_mtime (grub_device_t device, grub_int32_t *tm)
struct grub_ext2_data *data;
grub_disk_t disk = device->disk;
#ifndef GRUB_UTIL
grub_dl_ref (my_mod);
#endif
data = grub_ext2_mount (disk);
if (!data)
@ -926,9 +904,7 @@ grub_ext2_mtime (grub_device_t device, grub_int32_t *tm)
else
*tm = grub_le_to_cpu32 (data->sblock.utime);
#ifndef GRUB_UTIL
grub_dl_unref (my_mod);
#endif
grub_free (data);
@ -954,9 +930,7 @@ static struct grub_fs grub_ext2_fs =
GRUB_MOD_INIT(ext2)
{
grub_fs_register (&grub_ext2_fs);
#ifndef GRUB_UTIL
my_mod = mod;
#endif
}
GRUB_MOD_FINI(ext2)