Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 209CDC2D0E5 for ; Wed, 25 Mar 2020 18:50:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EC0922076F for ; Wed, 25 Mar 2020 18:49:59 +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="UpR8DKMX" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727464AbgCYSt7 (ORCPT ); Wed, 25 Mar 2020 14:49:59 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:55134 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727129AbgCYSt7 (ORCPT ); Wed, 25 Mar 2020 14:49:59 -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=kyQFEfu5PCuXYDPKrt0G3P4xOf4xdojsLdmarEXcypI=; b=UpR8DKMXPM2TbqsfhIORlXDIjl SwKUVcoRMjiQGS3Pq+ldcXfQxUhn/Mji9pedStLm2vec3sKX6EzkNPRRF9/2+M1TQly/TLjZElPMn uFgzGZej+FCCAJpiz13o+PNbw+6GwphxIFa9m6t9sXFMckwkYAr7iSwt5y4VnDBaosAF10/dqogf+ 4eireIEUcAHoYh+k8OJrzWrqY/9L+UFit7DRIDuOMVkCpG+SIVX87pRv1p5g4m2kBTtOO6TVimXX+ ZPakT2MweNpB3KJs+hVzhOAV4GyStl/6rVRmjgh62JOquYDFcOSDgIpiqFrfR2AILgVjxchc44WdS 4G0Dz5mg==; Received: from [2001:4bb8:18c:2a9e:c70:4a89:bc61:2] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1jHB6E-00037R-Tv; Wed, 25 Mar 2020 18:49:59 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Cc: david@fromorbit.com, Dave Chinner , Brian Foster , "Darrick J . Wong" Subject: [PATCH 8/8] xfs: remove some stale comments from the log code Date: Wed, 25 Mar 2020 19:43:05 +0100 Message-Id: <20200325184305.1361872-9-hch@lst.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200325184305.1361872-1-hch@lst.de> References: <20200325184305.1361872-1-hch@lst.de> 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 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Dave Chinner Signed-off-by: Dave Chinner Signed-off-by: Christoph Hellwig Reviewed-by: Brian Foster Reviewed-by: Darrick J. Wong --- fs/xfs/xfs_log.c | 59 +++++++++++------------------------------------- 1 file changed, 13 insertions(+), 46 deletions(-) diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c index 95e1174bf3c5..ed8296f8b887 100644 --- a/fs/xfs/xfs_log.c +++ b/fs/xfs/xfs_log.c @@ -463,14 +463,6 @@ xfs_log_reserve( return error; } - -/* - * NOTES: - * - * 1. currblock field gets updated at startup and after in-core logs - * marked as with WANT_SYNC. - */ - static bool __xlog_state_release_iclog( struct xlog *log, @@ -1909,7 +1901,7 @@ xlog_dealloc_log( log->l_mp->m_log = NULL; destroy_workqueue(log->l_ioend_workqueue); kmem_free(log); -} /* xlog_dealloc_log */ +} /* * Update counters atomically now that memcpy is done. @@ -2452,14 +2444,6 @@ xlog_write( return error; } - -/***************************************************************************** - * - * State Machine functions - * - ***************************************************************************** - */ - static void xlog_state_activate_iclog( struct xlog_in_core *iclog, @@ -2820,7 +2804,7 @@ xlog_state_done_syncing( */ wake_up_all(&iclog->ic_write_wait); spin_unlock(&log->l_icloglock); - xlog_state_do_callback(log); /* also cleans log */ + xlog_state_do_callback(log); } /* @@ -2940,13 +2924,14 @@ xlog_state_get_iclog_space( *logoffsetp = log_offset; return 0; -} /* xlog_state_get_iclog_space */ +} /* - * The first cnt-1 times through here we don't need to move the grant write head - * because the permanent reservation has reserved cnt times the unit amount. - * Release part of current permanent unit reservation and reset current - * reservation to be one units worth. Also move grant reservation head forward. + * The first cnt-1 times a ticket goes through here we don't need to move the + * grant write head because the permanent reservation has reserved cnt times the + * unit amount. Release part of current permanent unit reservation and reset + * current reservation to be one units worth. Also move grant reservation head + * forward. */ void xfs_log_ticket_regrant( @@ -3028,12 +3013,8 @@ xfs_log_ticket_ungrant( } /* - * Mark the current iclog in the ring as WANT_SYNC and move the current iclog - * pointer to the next iclog in the ring. - * - * When called from xlog_state_get_iclog_space(), the exact size of the iclog - * has not yet been determined, all we know is that we have run out of space in - * the current iclog. + * This routine will mark the current iclog in the ring as WANT_SYNC and move + * the current iclog pointer to the next iclog in the ring. */ STATIC void xlog_state_switch_iclogs( @@ -3078,7 +3059,7 @@ xlog_state_switch_iclogs( } ASSERT(iclog == log->l_iclog); log->l_iclog = iclog->ic_next; -} /* xlog_state_switch_iclogs */ +} /* * Write out all data in the in-core log as of this exact moment in time. @@ -3285,13 +3266,6 @@ xfs_log_force_lsn( return ret; } -/***************************************************************************** - * - * TICKET functions - * - ***************************************************************************** - */ - /* * Free a used ticket when its refcount falls to zero. */ @@ -3448,13 +3422,6 @@ xlog_ticket_alloc( return tic; } - -/****************************************************************************** - * - * Log debug routines - * - ****************************************************************************** - */ #if defined(DEBUG) /* * Make sure that the destination ptr is within the valid data region of @@ -3540,7 +3507,7 @@ xlog_verify_tail_lsn( if (blocks < BTOBB(iclog->ic_offset) + 1) xfs_emerg(log->l_mp, "%s: ran out of log space", __func__); } -} /* xlog_verify_tail_lsn */ +} /* * Perform a number of checks on the iclog before writing to disk. @@ -3643,7 +3610,7 @@ xlog_verify_iclog( } ptr += sizeof(xlog_op_header_t) + op_len; } -} /* xlog_verify_iclog */ +} #endif /* -- 2.25.1