4 files changed, 27 insertions, 9 deletions

diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c
index cfcdad3459dd..dfa1200daa61 100644
--- a/fs/jfs/jfs_logmgr.c
+++ b/fs/jfs/jfs_logmgr.c
@@ -927,9 +927,8 @@ static void lmPostGC(struct lbuf * bp)
  *      calculate new value of i_nextsync which determines when
  *      this code is called again.
  *
- *      this is called only from lmLog().
- *
- * PARAMETER:   ip      - pointer to logs inode.
+ * PARAMETERS:  log     - log structure
+ *              nosyncwait - 1 if called asynchronously
  *
  * RETURN:      0
  *                      
@@ -1051,6 +1050,18 @@ static int lmLogSync(struct jfs_log * log, int nosyncwait)
         return lsn;
 }
 
+/*
+ * NAME:        jfs_syncpt
+ *
+ * FUNCTION:    write log SYNCPT record for specified log
+ *
+ * PARAMETERS:  log     - log structure
+ */
+void jfs_syncpt(struct jfs_log *log)
+{       LOG_LOCK(log);
+        lmLogSync(log, 1);
+        LOG_UNLOCK(log);
+}
 
 /*
  * NAME:        lmLogOpen()
diff --git a/fs/jfs/jfs_logmgr.h b/fs/jfs/jfs_logmgr.h
index f4c121098d4f..51291fbc420c 100644
--- a/fs/jfs/jfs_logmgr.h
+++ b/fs/jfs/jfs_logmgr.h
@@ -508,5 +508,6 @@ extern int lmLogShutdown(struct jfs_log * log);
 extern int lmLogInit(struct jfs_log * log);
 extern int lmLogFormat(struct jfs_log *log, s64 logAddress, int logSize);
 extern void jfs_flush_journal(struct jfs_log * log, int wait);
+extern void jfs_syncpt(struct jfs_log *log);
 
 #endif                          /* _H_JFS_LOGMGR */
diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c
index bbc9c1407b55..e93d01aa12c4 100644
--- a/fs/jfs/jfs_txnmgr.c
+++ b/fs/jfs/jfs_txnmgr.c
@@ -567,9 +567,6 @@ void txEnd(tid_t tid)
                  * synchronize with logsync barrier
                  */
                 if (test_bit(log_SYNCBARRIER, &log->flag)) {
-                        /* forward log syncpt */
-                        /* lmSync(log); */
-
                         jfs_info("log barrier off: 0x%x", log->lsn);
 
                         /* enable new transactions start */
@@ -577,15 +574,22 @@ void txEnd(tid_t tid)
 
                         /* wakeup all waitors for logsync barrier */
                         TXN_WAKEUP(&log->syncwait);
+
+                        TXN_UNLOCK();
+
+                        /* forward log syncpt */
+                        jfs_syncpt(log);
+
+                        goto wakeup;
                 }
         }
 
+        TXN_UNLOCK();
+wakeup:
         /*
          * wakeup all waitors for a free tblock
          */
         TXN_WAKEUP(&TxAnchor.freewait);
-
-        TXN_UNLOCK();
 }
 
 
diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index 0812005364a1..5e774ed7fb64 100644
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -558,8 +558,10 @@ static int jfs_sync_fs(struct super_block *sb, int wait)
         struct jfs_log *log = JFS_SBI(sb)->log;
 
         /* log == NULL indicates read-only mount */
-        if (log)
+        if (log) {
                 jfs_flush_journal(log, wait);
+                jfs_syncpt(log);
+        }
 
         return 0;
 }