Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <259ff3c4-4d9c-aaf4-c7be-205615c00125@linux.alibaba.com>
Date:   Tue, 8 Aug 2023 08:54:42 +0800
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0)
 Gecko/20100101 Thunderbird/102.14.0
Subject: Re: [PATCH 3/4] ocfs2: stop using bdev->bd_super for journal error
 logging
To:     Christoph Hellwig <hch@lst.de>, Al Viro <viro@zeniv.linux.org.uk>,
        Christian Brauner <brauner@kernel.org>
Cc:     Theodore Ts'o <tytso@mit.edu>,
        Andreas Dilger <adilger.kernel@dilger.ca>,
        Mark Fasheh <mark@fasheh.com>,
        Joel Becker <jlbec@evilplan.org>, Jens Axboe <axboe@kernel.dk>,
        linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org,
        ocfs2-devel@lists.linux.dev, linux-block@vger.kernel.org
References: <20230807112625.652089-1-hch@lst.de>
 <20230807112625.652089-4-hch@lst.de>
Content-Language: en-US
From:   Joseph Qi <joseph.qi@linux.alibaba.com>
In-Reply-To: <20230807112625.652089-4-hch@lst.de>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk


On 8/7/23 7:26 PM, Christoph Hellwig wrote:
> All ocfs2 journal error handling and logging is based on buffer_heads,
> and the owning inode and thus super_block can be retrieved through
> bh->b_assoc_map->host.  Switch to using that to remove the last users
> of bdev->bd_super.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Looks fine.
Acked-by: Joseph Qi <joseph.qi@linux.alibaba.com>

> ---
>  fs/ocfs2/journal.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c
> index 25d8072ccfce46..c19c730c26e270 100644
> --- a/fs/ocfs2/journal.c
> +++ b/fs/ocfs2/journal.c
> @@ -557,7 +557,7 @@ static void ocfs2_abort_trigger(struct jbd2_buffer_trigger_type *triggers,
>  	     (unsigned long)bh,
>  	     (unsigned long long)bh->b_blocknr);
>  
> -	ocfs2_error(bh->b_bdev->bd_super,
> +	ocfs2_error(bh->b_assoc_map->host->i_sb,
>  		    "JBD2 has aborted our journal, ocfs2 cannot continue\n");
>  }
>  
> @@ -780,14 +780,14 @@ void ocfs2_journal_dirty(handle_t *handle, struct buffer_head *bh)
>  		mlog_errno(status);
>  		if (!is_handle_aborted(handle)) {
>  			journal_t *journal = handle->h_transaction->t_journal;
> -			struct super_block *sb = bh->b_bdev->bd_super;
>  
>  			mlog(ML_ERROR, "jbd2_journal_dirty_metadata failed. "
>  					"Aborting transaction and journal.\n");
>  			handle->h_err = status;
>  			jbd2_journal_abort_handle(handle);
>  			jbd2_journal_abort(journal, status);
> -			ocfs2_abort(sb, "Journal already aborted.\n");
> +			ocfs2_abort(bh->b_assoc_map->host->i_sb,
> +				    "Journal already aborted.\n");
>  		}
>  	}
>  }