allow us to link with libefence for qa runs again.

diff --git a/include/buildrules b/include/buildrules
index 11b192271156e8c4d952450bcdd0f15d42e10d04..ce87ad9727f9688f2019671d3fd285a73c7f0901 100644 (file)
--- a/include/buildrules
+++ b/include/buildrules
@@ -49,7 +49,7 @@ endif
 
 ifdef LTLIBRARY
 $(LTLIBRARY) : $(SUBDIRS) $(LTOBJECTS)
-       $(LTLINK) $(LDFLAGS) $(LTLDFLAGS) -o $(LTLIBRARY) $(LTOBJECTS) $(LDLIBS)
+       $(LTLINK) $(LTLDFLAGS) -o $(LTLIBRARY) $(LTOBJECTS)
 
 %.lo: %.c
        $(LTCOMPILE) -c $<

diff --git a/libdisk/xvm.c b/libdisk/xvm.c
index f1edc339594a18b8d0b884332b52b2f46961a13b..6891811f4f49e2c251434428344ace77991fd2b4 100644 (file)
--- a/libdisk/xvm.c
+++ b/libdisk/xvm.c
@@ -62,6 +62,10 @@ xvm_get_subvol_stripe(
        int             *swidth,
        struct stat64   *sb)
 {
+       if (!mnt_is_xvm_subvol(sb->st_dev))
+               return 0;
+
        /* TODO - DeanJ? - for now, always return false */
-       return 1;
+
+       return 0;
 }