From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: darrick.wong@oracle.com
Cc: Chandan Babu R <chandanrlinux@gmail.com>,
Christoph Hellwig <hch@lst.de>,
linux-xfs@vger.kernel.org
Subject: [PATCH 24/25] xfs: move log recovery buffer cancellation code to xfs_buf_item_recover.c
Date: Wed, 06 May 2020 18:04:17 -0700 [thread overview]
Message-ID: <158881345727.189971.4287628492235319845.stgit@magnolia> (raw)
In-Reply-To: <158881329912.189971.14392758631836955942.stgit@magnolia>
From: Darrick J. Wong <darrick.wong@oracle.com>
Move the helpers that handle incore buffer cancellation records to
xfs_buf_item_recover.c since they're not directly related to the main
log recovery machinery. No functional changes.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---
fs/xfs/libxfs/xfs_log_recover.h | 2 -
fs/xfs/xfs_buf_item_recover.c | 104 +++++++++++++++++++++++++++++++++++++++
fs/xfs/xfs_log_recover.c | 102 --------------------------------------
3 files changed, 104 insertions(+), 104 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_log_recover.h b/fs/xfs/libxfs/xfs_log_recover.h
index 929366d58c35..641132d0e39d 100644
--- a/fs/xfs/libxfs/xfs_log_recover.h
+++ b/fs/xfs/libxfs/xfs_log_recover.h
@@ -120,9 +120,7 @@ struct xlog_recover {
void xlog_buf_readahead(struct xlog *log, xfs_daddr_t blkno, uint len,
const struct xfs_buf_ops *ops);
-bool xlog_add_buffer_cancelled(struct xlog *log, xfs_daddr_t blkno, uint len);
bool xlog_is_buffer_cancelled(struct xlog *log, xfs_daddr_t blkno, uint len);
-bool xlog_put_buffer_cancelled(struct xlog *log, xfs_daddr_t blkno, uint len);
void xlog_recover_iodone(struct xfs_buf *bp);
void xlog_recover_release_intent(struct xlog *log, unsigned short intent_type,
diff --git a/fs/xfs/xfs_buf_item_recover.c b/fs/xfs/xfs_buf_item_recover.c
index 4ba2e27a15ca..04faa7310c4f 100644
--- a/fs/xfs/xfs_buf_item_recover.c
+++ b/fs/xfs/xfs_buf_item_recover.c
@@ -23,6 +23,110 @@
#include "xfs_dir2.h"
#include "xfs_quota.h"
+/*
+ * This structure is used during recovery to record the buf log items which
+ * have been canceled and should not be replayed.
+ */
+struct xfs_buf_cancel {
+ xfs_daddr_t bc_blkno;
+ uint bc_len;
+ int bc_refcount;
+ struct list_head bc_list;
+};
+
+static struct xfs_buf_cancel *
+xlog_find_buffer_cancelled(
+ struct xlog *log,
+ xfs_daddr_t blkno,
+ uint len)
+{
+ struct list_head *bucket;
+ struct xfs_buf_cancel *bcp;
+
+ if (!log->l_buf_cancel_table)
+ return NULL;
+
+ bucket = XLOG_BUF_CANCEL_BUCKET(log, blkno);
+ list_for_each_entry(bcp, bucket, bc_list) {
+ if (bcp->bc_blkno == blkno && bcp->bc_len == len)
+ return bcp;
+ }
+
+ return NULL;
+}
+
+static bool
+xlog_add_buffer_cancelled(
+ struct xlog *log,
+ xfs_daddr_t blkno,
+ uint len)
+{
+ struct xfs_buf_cancel *bcp;
+
+ /*
+ * If we find an existing cancel record, this indicates that the buffer
+ * was cancelled multiple times. To ensure that during pass 2 we keep
+ * the record in the table until we reach its last occurrence in the
+ * log, a reference count is kept to tell how many times we expect to
+ * see this record during the second pass.
+ */
+ bcp = xlog_find_buffer_cancelled(log, blkno, len);
+ if (bcp) {
+ bcp->bc_refcount++;
+ return false;
+ }
+
+ bcp = kmem_alloc(sizeof(struct xfs_buf_cancel), 0);
+ bcp->bc_blkno = blkno;
+ bcp->bc_len = len;
+ bcp->bc_refcount = 1;
+ list_add_tail(&bcp->bc_list, XLOG_BUF_CANCEL_BUCKET(log, blkno));
+ return true;
+}
+
+/*
+ * Check if there is and entry for blkno, len in the buffer cancel record table.
+ */
+bool
+xlog_is_buffer_cancelled(
+ struct xlog *log,
+ xfs_daddr_t blkno,
+ uint len)
+{
+ return xlog_find_buffer_cancelled(log, blkno, len) != NULL;
+}
+
+/*
+ * Check if there is and entry for blkno, len in the buffer cancel record table,
+ * and decremented the reference count on it if there is one.
+ *
+ * Remove the cancel record once the refcount hits zero, so that if the same
+ * buffer is re-used again after its last cancellation we actually replay the
+ * changes made at that point.
+ */
+static bool
+xlog_put_buffer_cancelled(
+ struct xlog *log,
+ xfs_daddr_t blkno,
+ uint len)
+{
+ struct xfs_buf_cancel *bcp;
+
+ bcp = xlog_find_buffer_cancelled(log, blkno, len);
+ if (!bcp) {
+ ASSERT(0);
+ return false;
+ }
+
+ if (--bcp->bc_refcount == 0) {
+ list_del(&bcp->bc_list);
+ kmem_free(bcp);
+ }
+ return true;
+}
+
+/* log buffer item recovery */
+
/*
* Sort buffer items for log recovery. Most buffer items should end up on the
* buffer list and are recovered first, with the following exceptions:
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index fa1b63bd9031..572e6707362a 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -55,17 +55,6 @@ STATIC int
xlog_do_recovery_pass(
struct xlog *, xfs_daddr_t, xfs_daddr_t, int, xfs_daddr_t *);
-/*
- * This structure is used during recovery to record the buf log items which
- * have been canceled and should not be replayed.
- */
-struct xfs_buf_cancel {
- xfs_daddr_t bc_blkno;
- uint bc_len;
- int bc_refcount;
- struct list_head bc_list;
-};
-
/*
* Sector aligned buffer routines for buffer create/read/write/access
*/
@@ -1964,97 +1953,6 @@ xlog_recover_reorder_trans(
return error;
}
-static struct xfs_buf_cancel *
-xlog_find_buffer_cancelled(
- struct xlog *log,
- xfs_daddr_t blkno,
- uint len)
-{
- struct list_head *bucket;
- struct xfs_buf_cancel *bcp;
-
- if (!log->l_buf_cancel_table)
- return NULL;
-
- bucket = XLOG_BUF_CANCEL_BUCKET(log, blkno);
- list_for_each_entry(bcp, bucket, bc_list) {
- if (bcp->bc_blkno == blkno && bcp->bc_len == len)
- return bcp;
- }
-
- return NULL;
-}
-
-bool
-xlog_add_buffer_cancelled(
- struct xlog *log,
- xfs_daddr_t blkno,
- uint len)
-{
- struct xfs_buf_cancel *bcp;
-
- /*
- * If we find an existing cancel record, this indicates that the buffer
- * was cancelled multiple times. To ensure that during pass 2 we keep
- * the record in the table until we reach its last occurrence in the
- * log, a reference count is kept to tell how many times we expect to
- * see this record during the second pass.
- */
- bcp = xlog_find_buffer_cancelled(log, blkno, len);
- if (bcp) {
- bcp->bc_refcount++;
- return false;
- }
-
- bcp = kmem_alloc(sizeof(struct xfs_buf_cancel), 0);
- bcp->bc_blkno = blkno;
- bcp->bc_len = len;
- bcp->bc_refcount = 1;
- list_add_tail(&bcp->bc_list, XLOG_BUF_CANCEL_BUCKET(log, blkno));
- return true;
-}
-
-/*
- * Check if there is and entry for blkno, len in the buffer cancel record table.
- */
-bool
-xlog_is_buffer_cancelled(
- struct xlog *log,
- xfs_daddr_t blkno,
- uint len)
-{
- return xlog_find_buffer_cancelled(log, blkno, len) != NULL;
-}
-
-/*
- * Check if there is and entry for blkno, len in the buffer cancel record table,
- * and decremented the reference count on it if there is one.
- *
- * Remove the cancel record once the refcount hits zero, so that if the same
- * buffer is re-used again after its last cancellation we actually replay the
- * changes made at that point.
- */
-bool
-xlog_put_buffer_cancelled(
- struct xlog *log,
- xfs_daddr_t blkno,
- uint len)
-{
- struct xfs_buf_cancel *bcp;
-
- bcp = xlog_find_buffer_cancelled(log, blkno, len);
- if (!bcp) {
- ASSERT(0);
- return false;
- }
-
- if (--bcp->bc_refcount == 0) {
- list_del(&bcp->bc_list);
- kmem_free(bcp);
- }
- return true;
-}
-
void
xlog_buf_readahead(
struct xlog *log,
next prev parent reply other threads:[~2020-05-07 1:06 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-07 1:01 [PATCH v4 00/25] xfs: refactor log recovery Darrick J. Wong
2020-05-07 1:01 ` [PATCH 01/25] xfs: convert xfs_log_recover_item_t to struct xfs_log_recover_item Darrick J. Wong
2020-05-07 1:01 ` [PATCH 02/25] xfs: refactor log recovery item sorting into a generic dispatch structure Darrick J. Wong
2020-05-07 1:01 ` [PATCH 03/25] xfs: refactor log recovery item dispatch for pass2 readhead functions Darrick J. Wong
2020-05-07 1:02 ` [PATCH 04/25] xfs: refactor log recovery item dispatch for pass1 commit functions Darrick J. Wong
2020-05-07 1:02 ` [PATCH 05/25] xfs: refactor log recovery buffer item dispatch for pass2 " Darrick J. Wong
2020-05-07 1:02 ` [PATCH 06/25] xfs: refactor log recovery inode " Darrick J. Wong
2020-05-07 1:02 ` [PATCH 07/25] xfs: refactor log recovery dquot " Darrick J. Wong
2020-05-07 1:02 ` [PATCH 08/25] xfs: refactor log recovery icreate " Darrick J. Wong
2020-05-07 1:02 ` [PATCH 09/25] xfs: refactor log recovery EFI " Darrick J. Wong
2020-05-07 1:02 ` [PATCH 10/25] xfs: refactor log recovery RUI " Darrick J. Wong
2020-05-07 1:02 ` [PATCH 11/25] xfs: refactor log recovery CUI " Darrick J. Wong
2020-05-07 1:02 ` [PATCH 12/25] xfs: refactor log recovery BUI " Darrick J. Wong
2020-05-07 1:03 ` [PATCH 13/25] xfs: remove log recovery quotaoff " Darrick J. Wong
2020-05-07 1:03 ` [PATCH 14/25] xfs: refactor recovered EFI log item playback Darrick J. Wong
2020-05-07 1:03 ` [PATCH 15/25] xfs: refactor recovered RUI " Darrick J. Wong
2020-05-07 1:03 ` [PATCH 16/25] xfs: refactor recovered CUI " Darrick J. Wong
2020-05-07 1:03 ` [PATCH 17/25] xfs: refactor recovered BUI " Darrick J. Wong
2020-05-07 1:03 ` [PATCH 18/25] xfs: refactor xlog_item_is_intent now that we're done converting Darrick J. Wong
2020-05-07 1:03 ` [PATCH 19/25] xfs: refactor releasing finished intents during log recovery Darrick J. Wong
2020-05-07 1:03 ` [PATCH 20/25] xfs: refactor adding recovered intent items to the log Darrick J. Wong
2020-05-07 6:06 ` Christoph Hellwig
2020-05-07 1:03 ` [PATCH 21/25] xfs: refactor intent item RECOVERED flag into the log item Darrick J. Wong
2020-05-07 1:04 ` [PATCH 22/25] xfs: refactor intent item iop_recover calls Darrick J. Wong
2020-05-07 1:04 ` [PATCH 23/25] xfs: hoist setting of XFS_LI_RECOVERED to caller Darrick J. Wong
2020-05-07 1:04 ` Darrick J. Wong [this message]
2020-05-07 1:04 ` [PATCH 25/25] xfs: remove unnecessary includes from xfs_log_recover.c Darrick J. Wong
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=158881345727.189971.4287628492235319845.stgit@magnolia \
--to=darrick.wong@oracle.com \
--cc=chandanrlinux@gmail.com \
--cc=hch@lst.de \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.