diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c
index 306165e61438..e8ae90be089b 100644
--- a/fs/jfs/jfs_logmgr.c
+++ b/fs/jfs/jfs_logmgr.c
@@ -1804,6 +1804,7 @@ static int lbmLogInit(struct jfs_log * log)
      * avoid deadlock here.
      */
     init_waitqueue_head(&log->free_wait);
+    init_waitqueue_head(&log->io_waitq);

     log->lbuf_free = NULL;

@@ -1855,6 +1856,8 @@ static void lbmLogShutdown(struct jfs_log * log)

     jfs_info("lbmLogShutdown: log:0x%p", log);

+    wait_event(log->io_waitq, !atomic_read(&log->io_inflight));
+
     lbuf = log->lbuf_free;
     while (lbuf) {
         struct lbuf *next = lbuf->l_freelist;
@@ -1976,6 +1979,8 @@ static int lbmRead(struct jfs_log * log, int pn,
diff --git a/fs/jfs/jfs_logmgr.h b/fs/jfs/jfs_logmgr.h
index 09e0ef6aecce..d8858448de6f 100644
--- a/fs/jfs/jfs_logmgr.h
+++ b/fs/jfs/jfs_logmgr.h
@@ -400,6 +400,9 @@ struct jfs_log {
     uuid_t uuid;        /* 16: 128-bit uuid of log device */

     int no_integrity;    /* 3: flag to disable journaling to disk */
+
+    atomic_t io_inflight;
+    wait_queue_head_t io_waitq;
 };

 /*