From: Christoph Hellwig <hch@lst.de>
To: linux-xfs@vger.kernel.org
Cc: david@fromorbit.com, Dave Chinner <dchinner@redhat.com>
Subject: [PATCH 8/9] xfs: remove some stale comments from the log code
Date: Mon, 23 Mar 2020 14:07:05 +0100 [thread overview]
Message-ID: <20200323130706.300436-9-hch@lst.de> (raw)
In-Reply-To: <20200323130706.300436-1-hch@lst.de>
From: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
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 d0d9f27ef90c..3eff7038e3ed 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.
- */
-
/*
* Write out an unmount record using the ticket provided. We have to account for
* the data space used in the unmount ticket as this write is not done from a
@@ -1912,7 +1904,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.
@@ -2456,14 +2448,6 @@ xlog_write(
return error;
}
-
-/*****************************************************************************
- *
- * State Machine functions
- *
- *****************************************************************************
- */
-
static void
xlog_state_activate_iclog(
struct xlog_in_core *iclog,
@@ -2824,7 +2808,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);
}
/*
@@ -2944,13 +2928,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
xlog_ticket_regrant(
@@ -3032,12 +3017,8 @@ xlog_ticket_done(
}
/*
- * 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(
@@ -3082,7 +3063,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.
@@ -3289,13 +3270,6 @@ xfs_log_force_lsn(
return ret;
}
-/*****************************************************************************
- *
- * TICKET functions
- *
- *****************************************************************************
- */
-
/*
* Free a used ticket when its refcount falls to zero.
*/
@@ -3453,13 +3427,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
@@ -3545,7 +3512,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.
@@ -3648,7 +3615,7 @@ xlog_verify_iclog(
}
ptr += sizeof(xlog_op_header_t) + op_len;
}
-} /* xlog_verify_iclog */
+}
#endif
/*
--
2.25.1
next prev 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 ` [PATCH 7/9] xfs: rename the log unmount writing functions Christoph Hellwig
2020-03-23 13:07 ` Christoph Hellwig [this message]
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-9-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