osaf/services/saf/ntfsv/ntfs/Makefile.am |  4 +++-
 osaf/services/saf/ntfsv/ntfs/ntfs_main.c |  6 ++++++
 2 files changed, 9 insertions(+), 1 deletions(-)


This is necessary to avoid blocking in saflog during role changes.

diff --git a/osaf/services/saf/ntfsv/ntfs/Makefile.am 
b/osaf/services/saf/ntfsv/ntfs/Makefile.am
--- a/osaf/services/saf/ntfsv/ntfs/Makefile.am
+++ b/osaf/services/saf/ntfsv/ntfs/Makefile.am
@@ -40,9 +40,11 @@ osaf_execbin_PROGRAMS = osafntfd
 
 osafntfd_CPPFLAGS = \
        $(AM_CPPFLAGS) \
-       -I$(top_srcdir)/osaf/libs/common/ntfsv/include
+       -I$(top_srcdir)/osaf/libs/common/ntfsv/include \
+       -I$(top_srcdir)/osaf/tools/saflog/include
 
 osafntfd_SOURCES = \
+       $(top_srcdir)/osaf/tools/saflog/src/saflog.c \
        ntfs_amf.c \
        ntfs_evt.c \
        ntfs_mbcsv.c \
diff --git a/osaf/services/saf/ntfsv/ntfs/ntfs_main.c 
b/osaf/services/saf/ntfsv/ntfs/ntfs_main.c
--- a/osaf/services/saf/ntfsv/ntfs/ntfs_main.c
+++ b/osaf/services/saf/ntfsv/ntfs/ntfs_main.c
@@ -38,6 +38,7 @@
 
 #include "ntfs.h"
 #include "ntfs_imcnutil.h"
+#include "saflog.h"
 
 /* ========================================================================
  *   DEFINITIONS
@@ -250,6 +251,11 @@ static uint32_t initialize()
                goto done;
        }
 
+       /* Initialize with saflog. This is necessary to avoid
+        *  getting blocked by LOG during role change (switchover/failover)
+        */
+       saflogInit();
+
 done:
        if (ntfs_cb->nid_started &&
                nid_notify("NTFD", rc, NULL) != NCSCC_RC_SUCCESS) {

------------------------------------------------------------------------------
Managing the Performance of Cloud-Based Applications
Take advantage of what the Cloud has to offer - Avoid Common Pitfalls.
Read the Whitepaper.
http://pubads.g.doubleclick.net/gampad/clk?id=121051231&iu=/4140/ostg.clktrk
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel

Reply via email to