mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-21 13:34:40 +03:00
Only do lockfs filesystem sync when suspending snapshots.
Switchover library building to use LIB_SUFFIX.
This commit is contained in:
parent
5e3bd86778
commit
e4c11ad108
@ -1,5 +1,7 @@
|
|||||||
Version 2.02.02 -
|
Version 2.02.02 -
|
||||||
====================================
|
====================================
|
||||||
|
Switchover library building to use LIB_SUFFIX.
|
||||||
|
Only do lockfs filesystem sync when suspending snapshots.
|
||||||
Always print warning if activation is disabled.
|
Always print warning if activation is disabled.
|
||||||
vgreduce removes mirror images.
|
vgreduce removes mirror images.
|
||||||
Add --mirrorsonly to vgreduce.
|
Add --mirrorsonly to vgreduce.
|
||||||
|
4
configure
vendored
4
configure
vendored
@ -1451,7 +1451,7 @@ case "$host_os" in
|
|||||||
CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
|
CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
|
||||||
LDDEPS="$LDDEPS .export.sym"
|
LDDEPS="$LDDEPS .export.sym"
|
||||||
LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
|
LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
|
||||||
SOFLAG="-shared"
|
LIB_SUFFIX="so"
|
||||||
DEVMAPPER=yes
|
DEVMAPPER=yes
|
||||||
ODIRECT=yes
|
ODIRECT=yes
|
||||||
SELINUX=yes
|
SELINUX=yes
|
||||||
@ -1465,7 +1465,7 @@ case "$host_os" in
|
|||||||
CLDNOWHOLEARCHIVE=
|
CLDNOWHOLEARCHIVE=
|
||||||
LDDEPS="$LDDEPS"
|
LDDEPS="$LDDEPS"
|
||||||
LDFLAGS="$LDFLAGS"
|
LDFLAGS="$LDFLAGS"
|
||||||
SOFLAG="-dynamiclib"
|
LIB_SUFFIX="dylib"
|
||||||
DEVMAPPER=yes
|
DEVMAPPER=yes
|
||||||
ODIRECT=no
|
ODIRECT=no
|
||||||
SELINUX=no
|
SELINUX=no
|
||||||
|
@ -35,7 +35,7 @@ case "$host_os" in
|
|||||||
CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
|
CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
|
||||||
LDDEPS="$LDDEPS .export.sym"
|
LDDEPS="$LDDEPS .export.sym"
|
||||||
LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
|
LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
|
||||||
SOFLAG="-shared"
|
LIB_SUFFIX="so"
|
||||||
DEVMAPPER=yes
|
DEVMAPPER=yes
|
||||||
ODIRECT=yes
|
ODIRECT=yes
|
||||||
SELINUX=yes
|
SELINUX=yes
|
||||||
@ -49,7 +49,7 @@ case "$host_os" in
|
|||||||
CLDNOWHOLEARCHIVE=
|
CLDNOWHOLEARCHIVE=
|
||||||
LDDEPS="$LDDEPS"
|
LDDEPS="$LDDEPS"
|
||||||
LDFLAGS="$LDFLAGS"
|
LDFLAGS="$LDFLAGS"
|
||||||
SOFLAG="-dynamiclib"
|
LIB_SUFFIX="dylib"
|
||||||
DEVMAPPER=yes
|
DEVMAPPER=yes
|
||||||
ODIRECT=no
|
ODIRECT=no
|
||||||
SELINUX=no
|
SELINUX=no
|
||||||
|
@ -21,11 +21,15 @@ CLDFLAGS += -ldevmapper -llvm2cmd
|
|||||||
|
|
||||||
SOURCES = dmeventd_mirror.c
|
SOURCES = dmeventd_mirror.c
|
||||||
|
|
||||||
|
ifeq ("@LIB_SUFFIX@","dylib")
|
||||||
|
LIB_SHARED = libdevmapper-event-lvm2mirror.dylib
|
||||||
|
else
|
||||||
LIB_SHARED = libdevmapper-event-lvm2mirror.so
|
LIB_SHARED = libdevmapper-event-lvm2mirror.so
|
||||||
|
endif
|
||||||
|
|
||||||
include $(top_srcdir)/make.tmpl
|
include $(top_srcdir)/make.tmpl
|
||||||
|
|
||||||
install: libdevmapper-event-lvm2mirror.so
|
install: libdevmapper-event-lvm2mirror.$(LIB_SUFFIX)
|
||||||
$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
|
$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
|
||||||
$(libdir)/$<.$(LIB_VERSION)
|
$(libdir)/$<.$(LIB_VERSION)
|
||||||
$(LN_S) -f $(libdir)/$<.$(LIB_VERSION) $(libdir)/$<
|
$(LN_S) -f $(libdir)/$<.$(LIB_VERSION) $(libdir)/$<
|
||||||
|
@ -21,11 +21,15 @@ CLDFLAGS += -ldevmapper -llvm2cmd
|
|||||||
|
|
||||||
SOURCES = dmeventd_mirror.c
|
SOURCES = dmeventd_mirror.c
|
||||||
|
|
||||||
|
ifeq ("@LIB_SUFFIX@","dylib")
|
||||||
|
LIB_SHARED = libdevmapper-event-lvm2mirror.dylib
|
||||||
|
else
|
||||||
LIB_SHARED = libdevmapper-event-lvm2mirror.so
|
LIB_SHARED = libdevmapper-event-lvm2mirror.so
|
||||||
|
endif
|
||||||
|
|
||||||
include $(top_srcdir)/make.tmpl
|
include $(top_srcdir)/make.tmpl
|
||||||
|
|
||||||
install: libdevmapper-event-lvm2mirror.so
|
install: libdevmapper-event-lvm2mirror.$(LIB_SUFFIX)
|
||||||
$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
|
$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
|
||||||
$(libdir)/$<.$(LIB_VERSION)
|
$(libdir)/$<.$(LIB_VERSION)
|
||||||
$(LN_S) -f $(libdir)/$<.$(LIB_VERSION) $(libdir)/$<
|
$(LN_S) -f $(libdir)/$<.$(LIB_VERSION) $(libdir)/$<
|
||||||
|
@ -977,6 +977,8 @@ static int _tree_action(struct dev_manager *dm, struct logical_volume *lv, actio
|
|||||||
goto_out;
|
goto_out;
|
||||||
break;
|
break;
|
||||||
case SUSPEND:
|
case SUSPEND:
|
||||||
|
if (!lv_is_origin(lv) && !lv_is_cow(lv))
|
||||||
|
dm_tree_skip_lockfs(root);
|
||||||
if (!dm_tree_suspend_children(root, dlid, ID_LEN + sizeof(UUID_PREFIX) - 1))
|
if (!dm_tree_suspend_children(root, dlid, ID_LEN + sizeof(UUID_PREFIX) - 1))
|
||||||
goto_out;
|
goto_out;
|
||||||
break;
|
break;
|
||||||
|
16
make.tmpl.in
16
make.tmpl.in
@ -31,7 +31,7 @@ CLDWHOLEARCHIVE += @CLDWHOLEARCHIVE@
|
|||||||
CLDNOWHOLEARCHIVE += @CLDNOWHOLEARCHIVE@
|
CLDNOWHOLEARCHIVE += @CLDNOWHOLEARCHIVE@
|
||||||
LDDEPS += @LDDEPS@
|
LDDEPS += @LDDEPS@
|
||||||
LDFLAGS += @LDFLAGS@
|
LDFLAGS += @LDFLAGS@
|
||||||
SOFLAG += @SOFLAG@
|
LIB_SUFFIX = @LIB_SUFFIX@
|
||||||
|
|
||||||
# Setup directory variables
|
# Setup directory variables
|
||||||
prefix = @prefix@
|
prefix = @prefix@
|
||||||
@ -56,7 +56,7 @@ ifndef MAKEFLAGS
|
|||||||
MAKEFLAGS = @JOBS@
|
MAKEFLAGS = @JOBS@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
SUFFIXES = .c .d .o .so .a .po .pot .mo
|
SUFFIXES = .c .d .o .so .a .po .pot .mo .dylib
|
||||||
|
|
||||||
CFLAGS += -fPIC -Wall -Wundef -Wshadow -Wcast-align -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline
|
CFLAGS += -fPIC -Wall -Wundef -Wshadow -Wcast-align -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline
|
||||||
|
|
||||||
@ -151,9 +151,17 @@ $(TARGETS): $(OBJECTS)
|
|||||||
%.so: %.o
|
%.so: %.o
|
||||||
$(CC) -c $(INCLUDES) $(CFLAGS) $< -o $@
|
$(CC) -c $(INCLUDES) $(CFLAGS) $< -o $@
|
||||||
|
|
||||||
|
ifeq ("@LIB_SUFFIX@","so")
|
||||||
$(LIB_SHARED): $(OBJECTS) $(LDDEPS)
|
$(LIB_SHARED): $(OBJECTS) $(LDDEPS)
|
||||||
$(CC) $(SOFLAG) -Wl,-soname,$(notdir $@).$(LIB_VERSION) \
|
$(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \
|
||||||
$(CLDFLAGS) $(OBJECTS) -o $@
|
$(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ("@LIB_SUFFIX@","dylib")
|
||||||
|
$(LIB_SHARED): $(OBJECTS) $(LDDEPS)
|
||||||
|
$(CC) -dynamiclib -dylib_current_version,$(LIB_VERSION) \
|
||||||
|
$(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
|
||||||
|
endif
|
||||||
|
|
||||||
$(LIB_STATIC): $(OBJECTS)
|
$(LIB_STATIC): $(OBJECTS)
|
||||||
$(RM) $@
|
$(RM) $@
|
||||||
|
Loading…
Reference in New Issue
Block a user