1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
|
Disabled all dmreg stuff
--- a/1.0.0.rc16/lib/Makefile.in
+++ b/1.0.0.rc16/lib/Makefile.in
@@ -45,10 +45,6 @@ SOURCES=\
format/ddf/ddf1_dump.c \
format/partition/dos.c
-ifeq ("@STATIC_LINK@", "no")
- SOURCES += register/dmreg.c
-endif
-
OBJECTS=$(SOURCES:%.c=%.o)
LIB_STATIC=$(top_srcdir)/lib/libdmraid.a
@@ -63,8 +59,8 @@ ifeq ("@KLIBC@", "no")
ifeq ("@STATIC_LINK@", "no")
LIB_SHARED=$(top_srcdir)/lib/libdmraid.so
LIB_EVENTS_SHARED=$(top_srcdir)/lib/$(LIB_EVENTS_NAME).so
- TARGETS += $(LIB_SHARED) $(LIB_EVENTS_SHARED)
- INSTALL_TARGETS += $(LIB_SHARED) $(LIB_EVENTS_SHARED)
+ TARGETS += $(LIB_SHARED)
+ INSTALL_TARGETS += $(LIB_SHARED)
ifeq ("@DIETLIBC@", "yes")
LIBDMRAIDLIBS += -ldevmapper_dietc
else
--- a/1.0.0.rc16/make.tmpl.in
+++ b/1.0.0.rc16/make.tmpl.in
@@ -137,7 +137,7 @@ $(TARGETS): $(OBJECTS)
%.so: $(OBJECTS)
$(CC) -shared -Wl,-soname,$(notdir $@).$(DMRAID_LIB_VERSION) \
- -Wl,--version-script,.export.sym $(OBJECTS) $(LIBDMRAIDLIBS) -o $@ -ldevmapper-event
+ -Wl,--version-script,.export.sym $(OBJECTS) $(LIBDMRAIDLIBS) -o $@
$(LIB_STATIC): $(OBJECTS)
$(RM) $@
--- a/1.0.0.rc16/tools/Makefile.in
+++ b/1.0.0.rc16/tools/Makefile.in
@@ -22,12 +22,6 @@ TARGETS=\
include $(top_srcdir)/make.tmpl
-ifeq ("@KLIBC@", "no")
- ifeq ("@STATIC_LINK@", "no")
- TARGETS += dmevent_tool
- endif
-endif
-
DMRAIDLIBS=-ldmraid
ifeq ("@KLIBC@", "yes")
@@ -37,16 +31,10 @@ else
ifeq ("@LIB_SO@", "no")
DMRAIDLIBS += -ldevmapper_dietc
endif
- ifeq ("@STATIC_LINK@", "no")
- DMEVENTTOOLLIBS = -ldevmapper-event_dietc
- endif
else
ifeq ("@LIB_SO@", "no")
DMRAIDLIBS += -ldevmapper
endif
- ifeq ("@STATIC_LINK@", "no")
- DMEVENTTOOLLIBS = -ldevmapper-event
- endif
endif
ifeq ("@LIBSELINUX@", "yes")
--- a/1.0.0.rc16/lib/.export.sym
+++ b/1.0.0.rc16/lib/.export.sym
@@ -52,8 +52,6 @@ Base {
dso_end_rebuild;
hot_spare_add;
dso_get_members;
- dm_register_device;
- dm_unregister_device;
dm_all_monitored;
local:
*;
--- a/1.0.0.rc16/lib/activate/activate.c
+++ b/1.0.0.rc16/lib/activate/activate.c
@@ -849,18 +849,12 @@ enum dm_what { DM_ACTIVATE, DM_REGISTER
static int
dm_register_for_event(char *dev_name, char *lib_name)
{
-#ifdef DMRAID_AUTOREGISTER
- dm_register_device(dev_name, lib_name);
-#endif
return 1;
}
static int
dm_unregister_for_event(char *dev_name, char *lib_name)
{
-#ifdef DMRAID_AUTOREGISTER
- dm_unregister_device(dev_name, lib_name);
-#endif
return 1;
}
@@ -874,6 +868,8 @@ do_device(struct lib_context *lc, struct
if (OPT_TEST(lc))
return 1;
+ return 1;
+
struct dmraid_format *fmt = get_format(rs);
if (fmt->name != NULL) {
--- a/1.0.0.rc16/lib/metadata/reconfig.c
+++ b/1.0.0.rc16/lib/metadata/reconfig.c
@@ -242,20 +242,16 @@ add_dev_to_raid(struct lib_context *lc,
* metadata on disks to OK state.
*/
/* Create lib-events library name */
- if (fmt->name) {
+ /*if (fmt->name) {
strncpy(lib_name, "libdmraid-events-", LIB_NAME_LENGTH);
strncat(lib_name, fmt->name,
LIB_NAME_LENGTH-strlen(fmt->name)-3);
strncat(lib_name, ".so", 3);
} else
goto err;
-
- /* Check registration */
- if (!dm_monitored_events(&pending, sub_rs->name, lib_name)) {
- /* If NOT registered update metadata to OK state. */
+*/
if (check_rd->fmt->metadata_handler)
check_rd->fmt->metadata_handler(lc, UPDATE_REBUILD_STATE, NULL, (void *) rs);
- }
}
#endif
|
