From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 03E0B288D2 for ; Mon, 13 Oct 2025 02:43:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760323401; cv=none; b=WivaaZPRplJpbtMKPIz94GgQKhZtVjHtrpuHXBMXPV/bgmZDgSmcoLW1teWYyGav1rZkCBPGVXASyUCwGnGk2iCNnhtgRNREJhBHIhMuVyD7XcOZSmwWT6vTlKh5l9M9vEzYPL0sUq96JDjOqXGsU9uNYD+Vl7G52BoePuasX8k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760323401; c=relaxed/simple; bh=luybYU7qRsHqO3+TOC2Sr4bSoXP5YW5110e6EjE6hNk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tD1sZT5vYqIDwxiaF6X8z9xxjOD4TO914DEJY0lu80tTvchLzwj8dNbAE3XoqFwPmBZl5igaahid3cHGLYZuAmvpVcIHqOjaZZIzd+0o9x5bahOtv2JwB3P0G9ljhUK3Cy1727mwHDMN9XUArRzeN7Weq4Q1W2+2uauZ0e493/I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=lst.de; spf=none smtp.mailfrom=bombadil.srs.infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=C1okcdN5; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=lst.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="C1okcdN5" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; 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=MjBo43Y9wKkddpyrBQOEuW1yS8niLoUN8Wb1B4+WlC4=; b=C1okcdN5SBhl5tcW7XGLtKQwCq U0WUABdabFxj62nVZPVRNlm2MP2Gkln2lsWLKMJPUqk7T6Koi+2hgDLK73XpGEp/EI05MZXdS7G1e 0Ex8/l8Qn25HHtYI/jbUOLrlKnA9M1/86ACq0VeqbdVsRjQ3ySMpB1/8YxOStnhWnHbiKQuwHlFTg aF8nmSKccCcvWEyM5NYrhQfMFR4ktG1SW7kr15ZDnmUSwW/lcmzpJ8tAxoK+X199eGeWLcddTOmxs WwI7V+v08pV02RIHvPlTavTlPkIwwpPE2cxGQExNZdRJgkVwI3mpEk27ukRLoco6/QS3pPSi6uWjl dRYthWpA==; Received: from [220.85.59.196] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98.2 #2 (Red Hat Linux)) id 1v88Wt-0000000C7JB-18kL; Mon, 13 Oct 2025 02:43:19 +0000 From: Christoph Hellwig To: Carlos Maiolino Cc: linux-xfs@vger.kernel.org Subject: [PATCH 9/9] xfs: remove the xlog_in_core_t typedef Date: Mon, 13 Oct 2025 11:42:13 +0900 Message-ID: <20251013024228.4109032-10-hch@lst.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251013024228.4109032-1-hch@lst.de> References: <20251013024228.4109032-1-hch@lst.de> Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Switch the few remaining users to use the underlying struct directly. Signed-off-by: Christoph Hellwig --- fs/xfs/xfs_log.c | 18 +++++++++--------- fs/xfs/xfs_log_priv.h | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c index 47a8e74c8c5c..a311385b23d8 100644 --- a/fs/xfs/xfs_log.c +++ b/fs/xfs/xfs_log.c @@ -1368,8 +1368,8 @@ xlog_alloc_log( int num_bblks) { struct xlog *log; - xlog_in_core_t **iclogp; - xlog_in_core_t *iclog, *prev_iclog=NULL; + struct xlog_in_core **iclogp; + struct xlog_in_core *iclog, *prev_iclog = NULL; int i; int error = -ENOMEM; uint log2_size = 0; @@ -1813,10 +1813,10 @@ xlog_sync( */ STATIC void xlog_dealloc_log( - struct xlog *log) + struct xlog *log) { - xlog_in_core_t *iclog, *next_iclog; - int i; + struct xlog_in_core *iclog, *next_iclog; + int i; /* * Destroy the CIL after waiting for iclog IO completion because an @@ -3293,7 +3293,7 @@ xlog_verify_iclog( int count) { struct xlog_rec_header *rhead = iclog->ic_header; - xlog_in_core_t *icptr; + struct xlog_in_core *icptr; void *base_ptr, *ptr; ptrdiff_t field_offset; uint8_t clientid; @@ -3481,11 +3481,10 @@ xlog_force_shutdown( STATIC int xlog_iclogs_empty( - struct xlog *log) + struct xlog *log) { - xlog_in_core_t *iclog; + struct xlog_in_core *iclog = log->l_iclog; - iclog = log->l_iclog; do { /* endianness does not matter here, zero is zero in * any language. @@ -3494,6 +3493,7 @@ xlog_iclogs_empty( return 0; iclog = iclog->ic_next; } while (iclog != log->l_iclog); + return 1; } diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h index 17733ba7f251..0fe59f0525aa 100644 --- a/fs/xfs/xfs_log_priv.h +++ b/fs/xfs/xfs_log_priv.h @@ -181,7 +181,7 @@ struct xlog_ticket { * We'll put all the read-only and l_icloglock fields in the first cacheline, * and move everything else out to subsequent cachelines. */ -typedef struct xlog_in_core { +struct xlog_in_core { wait_queue_head_t ic_force_wait; wait_queue_head_t ic_write_wait; struct xlog_in_core *ic_next; @@ -204,7 +204,7 @@ typedef struct xlog_in_core { struct work_struct ic_end_io_work; struct bio ic_bio; struct bio_vec ic_bvec[]; -} xlog_in_core_t; +}; /* * The CIL context is used to aggregate per-transaction details as well be @@ -418,7 +418,7 @@ struct xlog { /* waiting for iclog flush */ int l_covered_state;/* state of "covering disk * log entries" */ - xlog_in_core_t *l_iclog; /* head log queue */ + struct xlog_in_core *l_iclog; /* head log queue */ spinlock_t l_icloglock; /* grab to change iclog state */ int l_curr_cycle; /* Cycle number of log writes */ int l_prev_cycle; /* Cycle number before last -- 2.47.3