| Message ID | 20090403041935.GV15911@ether.msp.redhat.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | christophe varoqui |
| Headers | show |
Le Thu, 2 Apr 2009 23:19:36 -0500, Benjamin Marzinski <bmarzins@redhat.com> a écrit : > 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. > Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> > --- > 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 > =================================================================== > --- multipath-tools-090402.orig/libmultipath/Makefile > +++ multipath-tools-090402/libmultipath/Makefile > @@ -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 > Index: multipath-tools-090402/multipath/Makefile > =================================================================== > --- multipath-tools-090402.orig/multipath/Makefile > +++ multipath-tools-090402/multipath/Makefile > @@ -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 > > Index: multipath-tools-090402/multipathd/Makefile > =================================================================== > --- multipath-tools-090402.orig/multipathd/Makefile > +++ multipath-tools-090402/multipathd/Makefile > @@ -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 > =================================================================== > --- multipath-tools-090402.orig/libmultipath/checkers/Makefile > +++ multipath-tools-090402/libmultipath/checkers/Makefile > @@ -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 > dm-devel@redhat.com > https://www.redhat.com/mailman/listinfo/dm-devel -- dm-devel mailing list dm-devel@redhat.com https://www.redhat.com/mailman/listinfo/dm-devel
Index: multipath-tools-090402/libmultipath/Makefile =================================================================== --- multipath-tools-090402.orig/libmultipath/Makefile +++ multipath-tools-090402/libmultipath/Makefile @@ -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 Index: multipath-tools-090402/multipath/Makefile =================================================================== --- multipath-tools-090402.orig/multipath/Makefile +++ multipath-tools-090402/multipath/Makefile @@ -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 Index: multipath-tools-090402/multipathd/Makefile =================================================================== --- multipath-tools-090402.orig/multipathd/Makefile +++ multipath-tools-090402/multipathd/Makefile @@ -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 =================================================================== --- multipath-tools-090402.orig/libmultipath/checkers/Makefile +++ multipath-tools-090402/libmultipath/checkers/Makefile @@ -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 $@ $^
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. Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> --- libmultipath/Makefile | 7 ++++--- libmultipath/checkers/Makefile | 3 +++ multipath/Makefile | 5 ++--- multipathd/Makefile | 4 ++-- 4 files changed, 11 insertions(+), 8 deletions(-) -- dm-devel mailing list dm-devel@redhat.com https://www.redhat.com/mailman/listinfo/dm-devel