Re: [PATCH 2/2] jfs: Log shutdown error in jfs_freeze() function

[Gu Zheng <guz.fnst@cn.fujitsu.com>]

[-- Attachment #1: Type: text/plain, Size: 1607 bytes --]

Hi Vahram,
   I saw the same issue in the bugzilla:
https://bugzilla.kernel.org/show_bug.cgi?id=53331,
and I sent out a patch this issue, but I've get any feedback.
In fact, I think it's the right way to fix this issue,
can you help to test it?

Thanks,
Gu


On 05/24/2013 04:57 PM, Vahram Martirosyan wrote:

> In function jfs_freeze() the log is shut down through lmLogShutdown() call.
> When the "nointegrity" mount option is enabled, the log is actually not
> initialized. As a result the freeze operation in that case brings to a
> kernel OOPS.
> 
> The solution is to check if the "nointegrity" option is enabled and if it is not
> then shut the log down. 
> 
> May be this is not the best solution, but at least it fixes the OOPS.
> 
> Found by Linux File System Verification project (linuxtesting.org)
> 
> Signed-off-by: Vahram Martirosyan <vahram.martirosyan@linuxtesting.org>
> ---
>  fs/jfs/super.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/fs/jfs/super.c b/fs/jfs/super.c
> index a3d424d..9788970 100644
> --- a/fs/jfs/super.c
> +++ b/fs/jfs/super.c
> @@ -615,10 +615,12 @@ static int jfs_freeze(struct super_block *sb)
>  
>  	if (!(sb->s_flags & MS_RDONLY)) {
>  		txQuiesce(sb);
> -		rc = lmLogShutdown(log);
> -		if (rc != 0) {
> -			jfs_err("lmLogShutdown failed with return code %d", rc);
> -			return rc;
> +		if (!log->no_integrity) {
> +			rc = lmLogShutdown(log);
> +			if (rc != 0) {
> +				jfs_err("lmLogShutdown failed with return code %d", rc);
> +				return rc;
> +			}
>  		}
>  		rc = updateSuper(sb, FM_CLEAN);
>  		if (rc != 0) {



[-- Attachment #2: 0001-fs-jfs-Add-check-if-journaling-to-disk-has-been-disa.patch --]
[-- Type: text/plain, Size: 936 bytes --]

>From 2f1fb676cfc98602706eb8aaa1638272b8da8dfb Mon Sep 17 00:00:00 2001
From: Gu Zheng <guz.fnst@cn.fujitsu.com>
Date: Thu, 23 May 2013 16:14:19 +0800
Subject: [PATCH] fs/jfs: Add check if journaling to disk has been disabled in
 lbmRead()


Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com>
---
 fs/jfs/jfs_logmgr.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c
index c57499d..360d27c 100644
--- a/fs/jfs/jfs_logmgr.c
+++ b/fs/jfs/jfs_logmgr.c
@@ -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));
 
-- 
1.7.7