public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: linux-xfs@vger.kernel.org
Cc: david@fromorbit.com, Dave Chinner <dchinner@redhat.com>
Subject: [PATCH 7/9] xfs: rename the log unmount writing functions.
Date: Mon, 23 Mar 2020 14:07:04 +0100	[thread overview]
Message-ID: <20200323130706.300436-8-hch@lst.de> (raw)
In-Reply-To: <20200323130706.300436-1-hch@lst.de>

From: Dave Chinner <dchinner@redhat.com>

The naming and calling conventions are a bit of a mess. Clean it up
so the call chain looks like:

	xfs_log_unmount_write(mp)
	  xlog_unmount_write(log)
	    xlog_write_unmount_record(log, ticket)

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 fs/xfs/xfs_log.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 5a23a84973bb..d0d9f27ef90c 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -477,7 +477,7 @@ xfs_log_reserve(
  * transaction context that has already done the accounting for us.
  */
 static int
-xlog_write_unmount(
+xlog_write_unmount_record(
 	struct xlog		*log,
 	struct xlog_ticket	*ticket,
 	xfs_lsn_t		*lsn,
@@ -831,10 +831,10 @@ xlog_wait_on_iclog(
  * log.
  */
 static void
-xfs_log_write_unmount_record(
-	struct xfs_mount	*mp)
+xlog_unmount_write(
+	struct xlog		*log)
 {
-	struct xlog		*log = mp->m_log;
+	struct xfs_mount	*mp = log->l_mp;
 	struct xlog_in_core	*iclog;
 	struct xlog_ticket	*tic = NULL;
 	xfs_lsn_t		lsn;
@@ -858,7 +858,7 @@ xfs_log_write_unmount_record(
 		flags &= ~XLOG_UNMOUNT_TRANS;
 	}
 
-	error = xlog_write_unmount(log, tic, &lsn, flags);
+	error = xlog_write_unmount_record(log, tic, &lsn, flags);
 	/*
 	 * At this point, we're umounting anyway, so there's no point in
 	 * transitioning log state to IOERROR. Just continue...
@@ -924,7 +924,7 @@ xfs_log_unmount_write(
 	if (XLOG_FORCED_SHUTDOWN(log))
 		return;
 	xfs_log_unmount_verify_iclog(log);
-	xfs_log_write_unmount_record(mp);
+	xlog_unmount_write(log);
 }
 
 /*
-- 
2.25.1


  parent reply	other threads:[~2020-03-23 13:07 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-23 13:06 xfs: clean up log tickets and record writes v2 Christoph Hellwig
2020-03-23 13:06 ` [PATCH 1/9] xfs: don't try to write a start record into every iclog Christoph Hellwig
2020-03-23 13:06 ` [PATCH 2/9] xfs: re-order initial space accounting checks in xlog_write Christoph Hellwig
2020-03-23 13:07 ` [PATCH 3/9] xfs: refactor and split xfs_log_done() Christoph Hellwig
2020-03-23 13:07 ` [PATCH 4/9] xfs: split xlog_ticket_done Christoph Hellwig
2020-03-24  0:09   ` Dave Chinner
2020-03-23 13:07 ` [PATCH 5/9] xfs: merge xlog_commit_record with xlog_write_done() Christoph Hellwig
2020-03-23 13:07 ` [PATCH 6/9] xfs: factor out unmount record writing Christoph Hellwig
2020-03-23 13:07 ` Christoph Hellwig [this message]
2020-03-23 13:07 ` [PATCH 8/9] xfs: remove some stale comments from the log code Christoph Hellwig
2020-03-23 13:07 ` [PATCH 9/9] xfs: kill XLOG_TIC_INITED Christoph Hellwig
2020-03-24 11:43 ` xfs: clean up log tickets and record writes v2 Brian Foster
2020-03-24 12:40   ` Christoph Hellwig

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200323130706.300436-8-hch@lst.de \
    --to=hch@lst.de \
    --cc=david@fromorbit.com \
    --cc=dchinner@redhat.com \
    --cc=linux-xfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox