Clean up multipath linking
Benjamin Marzinski
maintainerPATCH 1/1 Clean up multipath linking
This is a patch to fix up the linking. It does two things. First, it makes libmultipath.so install to /lib/ just like a normal shared library, so you don't have to use -rpath to link to it. Second, and more importantly, it moves the libaio linking into libcheckdirectio.so, where it belongs. Since libcheckdirectio.so is a dynamic shared object, multipath and multipathd don't know what functions they need to link in from libaio. This fixes the directio lockup for me.
--- libmultipath/Makefile | 7 ++++--- libmultipath/checkers/Makefile | 3 +++ multipath/Makefile | 5 ++--- multipathd/Makefile | 4 ++-- 4 files changed, 11 insertions(+), 8 deletions(-)
libmultipath/Makefile +4 -3
@@ -23,14 +23,15 @@ endif all: $(LIBS) $(LIBS): $(OBJS) - $(CC) $(SHARED_FLAGS) $(CFLAGS) -o $@ $(OBJS) + $(CC) $(SHARED_FLAGS) -Wl,-soname,$@ $(CFLAGS) -o $@ $(OBJS) install: + $(INSTALL_PROGRAM) -d $(DESTDIR)$(prefix)/lib + $(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(prefix)/lib/$(LIBS) $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(libdir) - $(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(libdir)/$(LIBS) uninstall: - rm -f $(DESTDIR)$(libdir)/$(LIBS) + rm -f $(DESTDIR)$(prefix)/lib/$(LIBS) clean: rm -f core *.a *.o *.gz *.so
multipath/Makefile +2 -3
@@ -6,9 +6,8 @@ include ../Makefile.inc OBJS = main.o -CFLAGS += -I$(multipathdir) -Wl,-rpath,$(libdir) -LDFLAGS += -lpthread -ldevmapper -laio -ldl \ - -lmultipath -L$(multipathdir) +CFLAGS += -I$(multipathdir) +LDFLAGS += -lpthread -ldevmapper -ldl -lmultipath -L$(multipathdir) EXEC = multipath
multipathd/Makefile +2 -2
@@ -5,8 +5,8 @@ include ../Makefile.inc # # basic flags setting # -CFLAGS += -I$(multipathdir) -Wl,-rpath,$(libdir) -LDFLAGS += -lpthread -ldevmapper -lreadline -lncurses -laio -ldl \ +CFLAGS += -I$(multipathdir) +LDFLAGS += -lpthread -ldevmapper -lreadline -lncurses -ldl \ -lmultipath -L$(multipathdir) #
libmultipath/checkers/Makefile +3 -0
@@ -17,6 +17,9 @@ CFLAGS += -I.. all: $(LIBS) +libcheckdirectio.so: libsg.o directio.o + $(CC) $(SHARED_FLAGS) -o $@ $^ -laio + libcheck%.so: libsg.o %.o $(CC) $(SHARED_FLAGS) -o $@ $^
Quoted 9 lines · Benjamin Marzinski
This is a patch to fix up the linking. It does two things. First, it makes libmultipath.so install to
/lib/just like a normal shared library, so you don't have to use -rpath to link to it. Second, and more importantly, it moves the libaio linking into libcheckdirectio.so, where it belongs. Since libcheckdirectio.so is a dynamic shared object, multipath and multipathd don't know what functions they need to link in from libaio. This fixes the directio lockup for me.
How grateful I am. I was so focused on finding a bug in the async code, I missed this linking regression.
Quoted 82 lines
Signed-off-by Benjamin Marzinski <[email protected]>--- libmultipath/Makefile | 7 ++++--- libmultipath/checkers/Makefile | 3 +++ multipath/Makefile | 5 ++--- multipathd/Makefile | 4 ++-- 4 files changed, 11 insertions(+), 8 deletions(-)Index: multipath-tools-090402/libmultipath/Makefile
===================================================================libmultipath/Makefile +3
-1@@ -23,14 +23,15 @@ endif all: $(LIBS) $(LIBS): $(OBJS) - $(CC) $(SHARED_FLAGS) $(CFLAGS) -o $@ $(OBJS) + $(CC) $(SHARED_FLAGS) -Wl,-soname,$@ $(CFLAGS) -o $@ $(OBJS) install: + $(INSTALL_PROGRAM) -d $(DESTDIR)$(prefix)/lib + $(INSTALL_PROGRAM) -m 755 $(LIBS)$(DESTDIR)$(prefix)/lib/$(LIBS) $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(libdir)
libmultipath/Makefile +1
-2- $(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(libdir)/$(LIBS) uninstall: - rm -f $(DESTDIR)$(libdir)/$(LIBS) + rm -f $(DESTDIR)$(prefix)/lib/$(LIBS) clean: rm -f core *.a *.o *.gz *.soIndex: multipath-tools-090402/multipath/Makefile
===================================================================multipath/Makefile +2
-3@@ -6,9 +6,8 @@ include ../Makefile.inc OBJS = main.o -CFLAGS += -I$(multipathdir) -Wl,-rpath,$(libdir) -LDFLAGS += -lpthread -ldevmapper -laio -ldl \ - -lmultipath -L$(multipathdir) +CFLAGS += -I$(multipathdir) +LDFLAGS += -lpthread -ldevmapper -ldl -lmultipath -L$(multipathdir) EXEC = multipathIndex: multipath-tools-090402/multipathd/Makefile
===================================================================multipathd/Makefile +2
-2@@ -5,8 +5,8 @@ include ../Makefile.inc # # basic flags setting # -CFLAGS += -I$(multipathdir) -Wl,-rpath,$(libdir) -LDFLAGS += -lpthread -ldevmapper -lreadline -lncurses -laio -ldl \ +CFLAGS += -I$(multipathdir) +LDFLAGS += -lpthread -ldevmapper -lreadline -lncurses -ldl \ -lmultipath -L$(multipathdir) #Index: multipath-tools-090402/libmultipath/checkers/Makefile
===================================================================libmultipath/checkers/Makefile +3
-1@@ -17,6 +17,9 @@ CFLAGS += -I.. all: $(LIBS) +libcheckdirectio.so: libsg.o directio.o + $(CC) $(SHARED_FLAGS) -o $@ $^ -laio + libcheck%.so: libsg.o %.o $(CC) $(SHARED_FLAGS) -o $@ $^ --dm-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/dm-devel