From patchwork Mon Mar 16 14:42:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 11440511 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C3E1714B4 for ; Mon, 16 Mar 2020 14:51:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A282C20753 for ; Mon, 16 Mar 2020 14:51:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="KBZB4NWA" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731534AbgCPOv1 (ORCPT ); Mon, 16 Mar 2020 10:51:27 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:57616 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729643AbgCPOv1 (ORCPT ); Mon, 16 Mar 2020 10:51:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=dywp22k64Sgtqu5Qnvq/NOCs9xYMno6nUQ3Pd6gOGWI=; b=KBZB4NWAWDqvTsc+5h9Ok7h9fI Sfl6d2kErU6TkQAPhdoW2sujcV1OJQ1KflpQRcIf/4reoDFAAFL7AGvpiDG3TMBjE38MG5K/3xnom AZ4Guua7n/bNQzKU/U2Ks+eLTzHGbywVzbkFjkm/gbkrlMKGhq0+ClVhQSLgp0ceV87jcZ/DG+0Ns CWTT1bVmMfHGEiKR32PjpmvGhoJdZEFYV5D1em3lceOmE9xE3xG75SPEqKIsKsWTvIwW67q8RUzbO ScGEvLW/YGbOtQkld6Wb/G0KcbMnP6a0MYSxxVP592BtBBJD24/scIPfG8SgzD6BfgMH10quKC/Rz Etmi+8nQ==; Received: from 089144202225.atnat0011.highway.a1.net ([89.144.202.225] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1jDr5Q-00005Y-IT; Mon, 16 Mar 2020 14:51:26 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Cc: Dave Chinner Subject: [PATCH 03/14] xfs: simplify the xfs_log_release_iclog calling convention Date: Mon, 16 Mar 2020 15:42:22 +0100 Message-Id: <20200316144233.900390-4-hch@lst.de> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200316144233.900390-1-hch@lst.de> References: <20200316144233.900390-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org The only caller of xfs_log_release_iclog doesn't care about the return value, so remove it. Also don't bother passing the mount pointer, given that we can trivially derive it from the iclog. Signed-off-by: Christoph Hellwig Reviewed-by: Darrick J. Wong Reviewed-by: Brian Foster --- fs/xfs/xfs_log.c | 10 ++++------ fs/xfs/xfs_log.h | 3 +-- fs/xfs/xfs_log_cil.c | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c index 955df2902c2c..17ba92b115ea 100644 --- a/fs/xfs/xfs_log.c +++ b/fs/xfs/xfs_log.c @@ -597,12 +597,11 @@ xlog_state_release_iclog( return 0; } -int +void xfs_log_release_iclog( - struct xfs_mount *mp, struct xlog_in_core *iclog) { - struct xlog *log = mp->m_log; + struct xlog *log = iclog->ic_log; bool sync; if (iclog->ic_state == XLOG_STATE_IOERROR) @@ -618,10 +617,9 @@ xfs_log_release_iclog( if (sync) xlog_sync(log, iclog); } - return 0; + return; error: - xfs_force_shutdown(mp, SHUTDOWN_LOG_IO_ERROR); - return -EIO; + xfs_force_shutdown(log->l_mp, SHUTDOWN_LOG_IO_ERROR); } /* diff --git a/fs/xfs/xfs_log.h b/fs/xfs/xfs_log.h index 84e06805160f..b38602216c5a 100644 --- a/fs/xfs/xfs_log.h +++ b/fs/xfs/xfs_log.h @@ -121,8 +121,7 @@ void xfs_log_mount_cancel(struct xfs_mount *); xfs_lsn_t xlog_assign_tail_lsn(struct xfs_mount *mp); xfs_lsn_t xlog_assign_tail_lsn_locked(struct xfs_mount *mp); void xfs_log_space_wake(struct xfs_mount *mp); -int xfs_log_release_iclog(struct xfs_mount *mp, - struct xlog_in_core *iclog); +void xfs_log_release_iclog(struct xlog_in_core *iclog); int xfs_log_reserve(struct xfs_mount *mp, int length, int count, diff --git a/fs/xfs/xfs_log_cil.c b/fs/xfs/xfs_log_cil.c index 6a6278b8eb2d..047ac253edfe 100644 --- a/fs/xfs/xfs_log_cil.c +++ b/fs/xfs/xfs_log_cil.c @@ -866,7 +866,7 @@ xlog_cil_push_work( spin_unlock(&cil->xc_push_lock); /* release the hounds! */ - xfs_log_release_iclog(log->l_mp, commit_iclog); + xfs_log_release_iclog(commit_iclog); return; out_skip: