1 |
ssuominen 10/06/24 13:59:02 |
2 |
|
3 |
Added: udisks-1.0.1-lvm2_api_support.patch |
4 |
Log: |
5 |
Update to latest LVM2 API. |
6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 sys-fs/udisks/files/udisks-1.0.1-lvm2_api_support.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udisks/files/udisks-1.0.1-lvm2_api_support.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udisks/files/udisks-1.0.1-lvm2_api_support.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: udisks-1.0.1-lvm2_api_support.patch |
15 |
=================================================================== |
16 |
From 2b2fcf80841972b70ad695a5a1ed74487d4fd37a Mon Sep 17 00:00:00 2001 |
17 |
From: David Zeuthen <davidz@××××××.com> |
18 |
Date: Wed, 19 May 2010 17:01:31 +0000 |
19 |
Subject: Update to latest LVM2 API |
20 |
|
21 |
See |
22 |
|
23 |
http://lists.freedesktop.org/archives/devkit-devel/2010-April/000783.html |
24 |
--- |
25 |
diff --git a/src/probers/udisks-lvm-pv-export.c b/src/probers/udisks-lvm-pv-export.c |
26 |
index 5675fb8..ee6d8ed 100644 |
27 |
--- a/src/probers/udisks-lvm-pv-export.c |
28 |
+++ b/src/probers/udisks-lvm-pv-export.c |
29 |
@@ -47,7 +47,7 @@ find_vg_for_pv_uuid (lvm_t lvm_ctx, |
30 |
struct lvm_pv_list *pv_list; |
31 |
dm_list_iterate_items (pv_list, pvs) |
32 |
{ |
33 |
- char *uuid; |
34 |
+ const char *uuid; |
35 |
pv_t pv = pv_list->pv; |
36 |
|
37 |
uuid = lvm_pv_get_uuid (pv); |
38 |
@@ -58,10 +58,8 @@ find_vg_for_pv_uuid (lvm_t lvm_ctx, |
39 |
if (out_pv != NULL) |
40 |
*out_pv = pv; |
41 |
ret = vg; |
42 |
- dm_free (uuid); |
43 |
goto out; |
44 |
} |
45 |
- dm_free (uuid); |
46 |
} |
47 |
} |
48 |
} |
49 |
@@ -79,12 +77,12 @@ find_vg_for_pv_uuid (lvm_t lvm_ctx, |
50 |
static void |
51 |
print_vg (vg_t vg) |
52 |
{ |
53 |
- char *s; |
54 |
+ const char *s; |
55 |
struct dm_list *pvs; |
56 |
struct dm_list *lvs; |
57 |
|
58 |
- s = lvm_vg_get_uuid (vg); g_print ("UDISKS_LVM2_PV_VG_UUID=%s\n", s); dm_free (s); |
59 |
- s = lvm_vg_get_name (vg); g_print ("UDISKS_LVM2_PV_VG_NAME=%s\n", s); dm_free (s); |
60 |
+ s = lvm_vg_get_uuid (vg); g_print ("UDISKS_LVM2_PV_VG_UUID=%s\n", s); |
61 |
+ s = lvm_vg_get_name (vg); g_print ("UDISKS_LVM2_PV_VG_NAME=%s\n", s); |
62 |
g_print ("UDISKS_LVM2_PV_VG_SIZE=%" G_GUINT64_FORMAT "\n", lvm_vg_get_size (vg)); |
63 |
g_print ("UDISKS_LVM2_PV_VG_FREE_SIZE=%" G_GUINT64_FORMAT "\n", lvm_vg_get_free_size (vg)); |
64 |
g_print ("UDISKS_LVM2_PV_VG_EXTENT_SIZE=%" G_GUINT64_FORMAT "\n", lvm_vg_get_extent_size (vg)); |
65 |
@@ -117,17 +115,14 @@ print_vg (vg_t vg) |
66 |
str = g_string_new (NULL); |
67 |
dm_list_iterate_items (pv_list, pvs) |
68 |
{ |
69 |
- char *uuid; |
70 |
+ const char *uuid; |
71 |
guint64 size; |
72 |
guint64 free_size; |
73 |
pv_t pv = pv_list->pv; |
74 |
|
75 |
uuid = lvm_pv_get_uuid (pv); |
76 |
if (uuid != NULL) |
77 |
- { |
78 |
- g_string_append_printf (str, "uuid=%s", uuid); |
79 |
- dm_free (uuid); |
80 |
- } |
81 |
+ g_string_append_printf (str, "uuid=%s", uuid); |
82 |
size = lvm_pv_get_size (pv); |
83 |
g_string_append_printf (str, ";size=%" G_GUINT64_FORMAT, size); |
84 |
free_size = lvm_pv_get_free (pv); |
85 |
@@ -173,8 +168,8 @@ print_vg (vg_t vg) |
86 |
str = g_string_new (NULL); |
87 |
dm_list_iterate_items (lv_list, lvs) |
88 |
{ |
89 |
- char *uuid; |
90 |
- char *name; |
91 |
+ const char *uuid; |
92 |
+ const char *name; |
93 |
gboolean is_active; |
94 |
guint64 size; |
95 |
lv_t lv = lv_list->lv; |
96 |
@@ -195,11 +190,6 @@ print_vg (vg_t vg) |
97 |
g_string_append_printf (str, "active=%d", is_active); |
98 |
g_string_append_c (str, ' '); |
99 |
} |
100 |
- |
101 |
- if (uuid != NULL) |
102 |
- dm_free (uuid); |
103 |
- if (name != NULL) |
104 |
- dm_free (name); |
105 |
} |
106 |
g_print ("UDISKS_LVM2_PV_VG_LV_LIST=%s\n", str->str); |
107 |
g_string_free (str, TRUE); |
108 |
@@ -212,9 +202,9 @@ print_vg (vg_t vg) |
109 |
static void |
110 |
print_pv (pv_t pv) |
111 |
{ |
112 |
- char *s; |
113 |
+ const char *s; |
114 |
|
115 |
- s = lvm_pv_get_uuid (pv); g_print ("UDISKS_LVM2_PV_UUID=%s\n", s); dm_free (s); |
116 |
+ s = lvm_pv_get_uuid (pv); g_print ("UDISKS_LVM2_PV_UUID=%s\n", s); |
117 |
g_print ("UDISKS_LVM2_PV_NUM_MDA=%" G_GUINT64_FORMAT "\n", lvm_pv_get_mda_count (pv)); |
118 |
|
119 |
/* TODO: ask for more API in liblvm - pvdisplay(8) suggests more information |
120 |
-- |
121 |
cgit v0.8.3-6-g21f6 |