Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix exported privated symbols and missing declarations #920

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/plugins/fs/generic.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ typedef struct BDFSMkfsOptions {
guint8 reserve[32];
} BDFSMkfsOptions;

BDFSMkfsOptions* bd_fs_mkfs_options_copy (BDFSMkfsOptions *data);
void bd_fs_mkfs_options_free (BDFSMkfsOptions *data);

const gchar** bd_fs_supported_filesystems (GError **error);

gboolean bd_fs_mkfs (const gchar *device, const gchar *fstype, BDFSMkfsOptions *options, const BDExtraArg **extra, GError **error);
Expand Down Expand Up @@ -75,6 +78,9 @@ typedef struct BDFSFeatures {
const gchar *partition_type;
} BDFSFeatures;

BDFSFeatures* bd_fs_features_copy (BDFSFeatures *data);
void bd_fs_features_free (BDFSFeatures *data);

const BDFSFeatures* bd_fs_features (const gchar *fstype, GError **error);

gboolean bd_fs_can_mkfs (const gchar *type, BDFSMkfsOptionsFlags *options, gchar **required_utility, GError **error);
Expand Down
58 changes: 0 additions & 58 deletions src/plugins/loop.c
Original file line number Diff line number Diff line change
Expand Up @@ -450,64 +450,6 @@ gboolean bd_loop_teardown (const gchar *loop, GError **error) {
return TRUE;
}

/**
* bd_loop_get_autoclear:
* @loop: path or name of the loop device
* @error: (out) (optional): place to store error (if any)
*
* Returns: whether the autoclear flag is set on the @loop device or not (if %FALSE, @error may be set)
*
* Tech category: %BD_LOOP_TECH_LOOP-%BD_LOOP_TECH_MODE_QUERY
*/
gboolean bd_loop_get_autoclear (const gchar *loop, GError **error) {
gchar *sys_path = NULL;
gboolean success = FALSE;
gchar *contents = NULL;
gboolean ret = FALSE;
gchar *dev_loop = NULL;
gint fd = -1;
struct loop_info64 li64;

/* first try reading the value from /sys which seems to be safer than
potentially stepping on each other's toes with udev during the ioctl() */
if (g_str_has_prefix (loop, "/dev/"))
sys_path = g_strdup_printf ("/sys/class/block/%s/loop/autoclear", loop + 5);
else
sys_path = g_strdup_printf ("/sys/class/block/%s/loop/autoclear", loop);

success = g_file_get_contents (sys_path, &contents, NULL, NULL);
g_free (sys_path);
if (success) {
g_strstrip (contents);
ret = g_strcmp0 (contents, "1") == 0;
g_free (contents);
return ret;
}

/* else try using the ioctl() */
if (!g_str_has_prefix (loop, "/dev/"))
dev_loop = g_strdup_printf ("/dev/%s", loop);

fd = open (dev_loop ? dev_loop : loop, O_RDONLY);
g_free (dev_loop);
if (fd < 0) {
g_set_error (error, BD_LOOP_ERROR, BD_LOOP_ERROR_DEVICE,
"Failed to open device %s: %m", loop);
return FALSE;
}

memset (&li64, 0, sizeof (li64));
if (ioctl (fd, LOOP_GET_STATUS64, &li64) < 0) {
g_set_error (error, BD_LOOP_ERROR, BD_LOOP_ERROR_FAIL,
"Failed to get status of the device %s: %m", loop);
close (fd);
return FALSE;
}

close (fd);
return (li64.lo_flags & LO_FLAGS_AUTOCLEAR) != 0;
}

/**
* bd_loop_set_autoclear:
* @loop: path or name of the loop device
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/lvm-dbus.c
Original file line number Diff line number Diff line change
Expand Up @@ -2355,7 +2355,7 @@ gboolean bd_lvm_delete_vg_tags (const gchar *vg_name, const gchar **tags, GError
return _manage_lvm_tags (obj_path, NULL, VG_INTF, tags, "TagsDel", error);
}

gboolean _vglock_start_stop (const gchar *vg_name, gboolean start, const BDExtraArg **extra, GError **error) {
static gboolean _vglock_start_stop (const gchar *vg_name, gboolean start, const BDExtraArg **extra, GError **error) {
GVariantBuilder builder;
GVariant *params = NULL;

Expand Down
2 changes: 1 addition & 1 deletion src/plugins/lvm.c
Original file line number Diff line number Diff line change
Expand Up @@ -1607,7 +1607,7 @@ gboolean bd_lvm_delete_vg_tags (const gchar *vg_name, const gchar **tags, GError
return _manage_lvm_tags (vg_name, tags, "--deltag", "vgchange", error);
}

gboolean _vglock_start_stop (const gchar *vg_name, gboolean start, const BDExtraArg **extra, GError **error) {
static gboolean _vglock_start_stop (const gchar *vg_name, gboolean start, const BDExtraArg **extra, GError **error) {
const gchar *args[4] = {"vgchange", NULL, vg_name, NULL};

if (start)
Expand Down
5 changes: 4 additions & 1 deletion src/plugins/lvm.h
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,9 @@ typedef struct BDLVMSEGdata {
gchar *pvdev;
} BDLVMSEGdata;

BDLVMSEGdata* bd_lvm_segdata_copy (BDLVMSEGdata *data);
void bd_lvm_segdata_free (BDLVMSEGdata *data);

typedef struct BDLVMLVdata {
gchar *lv_name;
gchar *vg_name;
Expand Down Expand Up @@ -312,7 +315,7 @@ gboolean bd_lvm_vdo_disable_deduplication (const gchar *vg_name, const gchar *po
gboolean bd_lvm_thpool_convert (const gchar *vg_name, const gchar *data_lv, const gchar *metadata_lv, const gchar *name, const BDExtraArg **extra, GError **error);
gboolean bd_lvm_cache_pool_convert (const gchar *vg_name, const gchar *data_lv, const gchar *metadata_lv, const gchar *name, const BDExtraArg **extra, GError **error);
gboolean bd_lvm_vdo_pool_convert (const gchar *vg_name, const gchar *pool_lv, const gchar *name, guint64 virtual_size, guint64 index_memory, gboolean compression, gboolean deduplication, BDLVMVDOWritePolicy write_policy, const BDExtraArg **extra, GError **error);
gchar* bd_lvm_thlvpoolname (const gchar *vg_name, const gchar *lv_name, GError **error);
gchar* bd_lvm_vdolvpoolname (const gchar *vg_name, const gchar *lv_name, GError **error);

const gchar* bd_lvm_get_vdo_operating_mode_str (BDLVMVDOOperatingMode mode, GError **error);
const gchar* bd_lvm_get_vdo_compression_state_str (BDLVMVDOCompressionState state, GError **error);
Expand Down