fs/jfs: Add check if journaling to disk has been disabled in lbmRead()
authorGu Zheng <guz.fnst@cn.fujitsu.com>
Thu, 23 May 2013 08:14:19 +0000 (16:14 +0800)
committerDave Kleikamp <dave.kleikamp@oracle.com>
Fri, 24 May 2013 21:03:47 +0000 (16:03 -0500)
Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com>
Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
fs/jfs/jfs_logmgr.c

index c57499d..360d27c 100644 (file)
@@ -2009,7 +2009,13 @@ static int lbmRead(struct jfs_log * log, int pn, struct lbuf ** bpp)
 
        bio->bi_end_io = lbmIODone;
        bio->bi_private = bp;
-       submit_bio(READ_SYNC, bio);
+       /*check if journaling to disk has been disabled*/
+       if (log->no_integrity) {
+               bio->bi_size = 0;
+               lbmIODone(bio, 0);
+       } else {
+               submit_bio(READ_SYNC, bio);
+       }
 
        wait_event(bp->l_ioevent, (bp->l_flag != lbmREAD));