From: "Darrick J. Wong" <djwong@kernel.org>
To: djwong@kernel.org
Cc: linux-xfs@vger.kernel.org, hch@lst.de
Subject: [PATCH 4/9] xfs: remove xfs_trans_set_rmap_flags
Date: Thu, 20 Jun 2024 16:08:02 -0700 [thread overview]
Message-ID: <171892419301.3184396.4725607583390300491.stgit@frogsfrogsfrogs> (raw)
In-Reply-To: <171892419209.3184396.10441735798864910501.stgit@frogsfrogsfrogs>
From: Darrick J. Wong <djwong@kernel.org>
Remove this single-use helper.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
fs/xfs/xfs_rmap_item.c | 79 +++++++++++++++++++++---------------------------
1 file changed, 34 insertions(+), 45 deletions(-)
diff --git a/fs/xfs/xfs_rmap_item.c b/fs/xfs/xfs_rmap_item.c
index 2e732aded58e0..7e998a7eb0422 100644
--- a/fs/xfs/xfs_rmap_item.c
+++ b/fs/xfs/xfs_rmap_item.c
@@ -226,49 +226,6 @@ static const struct xfs_item_ops xfs_rud_item_ops = {
.iop_intent = xfs_rud_item_intent,
};
-/* Set the map extent flags for this reverse mapping. */
-static void
-xfs_trans_set_rmap_flags(
- struct xfs_map_extent *map,
- enum xfs_rmap_intent_type type,
- int whichfork,
- xfs_exntst_t state)
-{
- map->me_flags = 0;
- if (state == XFS_EXT_UNWRITTEN)
- map->me_flags |= XFS_RMAP_EXTENT_UNWRITTEN;
- if (whichfork == XFS_ATTR_FORK)
- map->me_flags |= XFS_RMAP_EXTENT_ATTR_FORK;
- switch (type) {
- case XFS_RMAP_MAP:
- map->me_flags |= XFS_RMAP_EXTENT_MAP;
- break;
- case XFS_RMAP_MAP_SHARED:
- map->me_flags |= XFS_RMAP_EXTENT_MAP_SHARED;
- break;
- case XFS_RMAP_UNMAP:
- map->me_flags |= XFS_RMAP_EXTENT_UNMAP;
- break;
- case XFS_RMAP_UNMAP_SHARED:
- map->me_flags |= XFS_RMAP_EXTENT_UNMAP_SHARED;
- break;
- case XFS_RMAP_CONVERT:
- map->me_flags |= XFS_RMAP_EXTENT_CONVERT;
- break;
- case XFS_RMAP_CONVERT_SHARED:
- map->me_flags |= XFS_RMAP_EXTENT_CONVERT_SHARED;
- break;
- case XFS_RMAP_ALLOC:
- map->me_flags |= XFS_RMAP_EXTENT_ALLOC;
- break;
- case XFS_RMAP_FREE:
- map->me_flags |= XFS_RMAP_EXTENT_FREE;
- break;
- default:
- ASSERT(0);
- }
-}
-
/* Sort rmap intents by AG. */
static int
xfs_rmap_update_diff_items(
@@ -307,8 +264,40 @@ xfs_rmap_update_log_item(
map->me_startblock = ri->ri_bmap.br_startblock;
map->me_startoff = ri->ri_bmap.br_startoff;
map->me_len = ri->ri_bmap.br_blockcount;
- xfs_trans_set_rmap_flags(map, ri->ri_type, ri->ri_whichfork,
- ri->ri_bmap.br_state);
+
+ map->me_flags = 0;
+ if (ri->ri_bmap.br_state == XFS_EXT_UNWRITTEN)
+ map->me_flags |= XFS_RMAP_EXTENT_UNWRITTEN;
+ if (ri->ri_whichfork == XFS_ATTR_FORK)
+ map->me_flags |= XFS_RMAP_EXTENT_ATTR_FORK;
+ switch (ri->ri_type) {
+ case XFS_RMAP_MAP:
+ map->me_flags |= XFS_RMAP_EXTENT_MAP;
+ break;
+ case XFS_RMAP_MAP_SHARED:
+ map->me_flags |= XFS_RMAP_EXTENT_MAP_SHARED;
+ break;
+ case XFS_RMAP_UNMAP:
+ map->me_flags |= XFS_RMAP_EXTENT_UNMAP;
+ break;
+ case XFS_RMAP_UNMAP_SHARED:
+ map->me_flags |= XFS_RMAP_EXTENT_UNMAP_SHARED;
+ break;
+ case XFS_RMAP_CONVERT:
+ map->me_flags |= XFS_RMAP_EXTENT_CONVERT;
+ break;
+ case XFS_RMAP_CONVERT_SHARED:
+ map->me_flags |= XFS_RMAP_EXTENT_CONVERT_SHARED;
+ break;
+ case XFS_RMAP_ALLOC:
+ map->me_flags |= XFS_RMAP_EXTENT_ALLOC;
+ break;
+ case XFS_RMAP_FREE:
+ map->me_flags |= XFS_RMAP_EXTENT_FREE;
+ break;
+ default:
+ ASSERT(0);
+ }
}
static struct xfs_log_item *
next prev parent reply other threads:[~2024-06-20 23:08 UTC|newest]
Thread overview: 114+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-20 22:50 [PATCHBOMB 6.11] xfs: inode cleanups for metadata directories Darrick J. Wong
2024-06-20 22:57 ` [PATCHSET v3.0 1/5] xfs: hoist inode operations to libxfs Darrick J. Wong
2024-06-20 22:58 ` [PATCH 01/24] xfs: use consistent uid/gid when grabbing dquots for inodes Darrick J. Wong
2024-06-21 4:37 ` Christoph Hellwig
2024-06-20 22:58 ` [PATCH 02/24] xfs: move inode copy-on-write predicates to xfs_inode.[ch] Darrick J. Wong
2024-06-21 4:37 ` Christoph Hellwig
2024-06-20 22:59 ` [PATCH 03/24] xfs: hoist extent size helpers to libxfs Darrick J. Wong
2024-06-21 4:37 ` Christoph Hellwig
2024-06-20 22:59 ` [PATCH 04/24] xfs: hoist inode flag conversion functions " Darrick J. Wong
2024-06-21 4:38 ` Christoph Hellwig
2024-06-20 22:59 ` [PATCH 05/24] xfs: hoist project id get/set " Darrick J. Wong
2024-06-21 4:38 ` Christoph Hellwig
2024-06-20 22:59 ` [PATCH 06/24] xfs: pack icreate initialization parameters into a separate structure Darrick J. Wong
2024-06-21 4:39 ` Christoph Hellwig
2024-06-20 23:00 ` [PATCH 07/24] xfs: implement atime updates in xfs_trans_ichgtime Darrick J. Wong
2024-06-21 4:39 ` Christoph Hellwig
2024-06-20 23:00 ` [PATCH 08/24] xfs: use xfs_trans_ichgtime to set times when allocating inode Darrick J. Wong
2024-06-21 4:39 ` Christoph Hellwig
2024-06-20 23:00 ` [PATCH 09/24] xfs: split new inode creation into two pieces Darrick J. Wong
2024-06-21 4:40 ` Christoph Hellwig
2024-06-20 23:01 ` [PATCH 10/24] xfs: hoist new inode initialization functions to libxfs Darrick J. Wong
2024-06-21 4:40 ` Christoph Hellwig
2024-06-20 23:01 ` [PATCH 11/24] xfs: push xfs_icreate_args creation out of xfs_create* Darrick J. Wong
2024-06-21 4:40 ` Christoph Hellwig
2024-06-20 23:01 ` [PATCH 12/24] xfs: wrap inode creation dqalloc calls Darrick J. Wong
2024-06-21 4:41 ` Christoph Hellwig
2024-06-20 23:01 ` [PATCH 13/24] xfs: hoist xfs_iunlink to libxfs Darrick J. Wong
2024-06-21 4:41 ` Christoph Hellwig
2024-06-20 23:02 ` [PATCH 14/24] xfs: hoist xfs_{bump,drop}link " Darrick J. Wong
2024-06-21 4:41 ` Christoph Hellwig
2024-06-20 23:02 ` [PATCH 15/24] xfs: separate the icreate logic around INIT_XATTRS Darrick J. Wong
2024-06-21 4:42 ` Christoph Hellwig
2024-06-20 23:02 ` [PATCH 16/24] xfs: create libxfs helper to link a new inode into a directory Darrick J. Wong
2024-06-21 4:42 ` Christoph Hellwig
2024-06-20 23:02 ` [PATCH 17/24] xfs: create libxfs helper to link an existing " Darrick J. Wong
2024-06-21 4:44 ` Christoph Hellwig
2024-06-20 23:03 ` [PATCH 18/24] xfs: hoist inode free function to libxfs Darrick J. Wong
2024-06-21 4:44 ` Christoph Hellwig
2024-06-20 23:03 ` [PATCH 19/24] xfs: create libxfs helper to remove an existing inode/name from a directory Darrick J. Wong
2024-06-21 4:44 ` Christoph Hellwig
2024-06-20 23:03 ` [PATCH 20/24] xfs: create libxfs helper to exchange two directory entries Darrick J. Wong
2024-06-21 4:45 ` Christoph Hellwig
2024-06-20 23:03 ` [PATCH 21/24] xfs: create libxfs helper to rename " Darrick J. Wong
2024-06-21 4:45 ` Christoph Hellwig
2024-06-20 23:04 ` [PATCH 22/24] xfs: move dirent update hooks to xfs_dir2.c Darrick J. Wong
2024-06-21 4:45 ` Christoph Hellwig
2024-06-20 23:04 ` [PATCH 23/24] xfs: get rid of trivial rename helpers Darrick J. Wong
2024-06-21 4:45 ` Christoph Hellwig
2024-06-20 23:04 ` [PATCH 24/24] xfs: don't use the incore struct xfs_sb for offsets into struct xfs_dsb Darrick J. Wong
2024-06-21 4:46 ` Christoph Hellwig
2024-06-20 22:57 ` [PATCHSET v3.0 2/5] xfs: extent free log intent cleanups Darrick J. Wong
2024-06-20 23:04 ` [PATCH 1/9] xfs: clean up extent free log intent item tracepoint callsites Darrick J. Wong
2024-06-21 4:46 ` Christoph Hellwig
2024-06-20 23:05 ` [PATCH 2/9] xfs: convert "skip_discard" to a proper flags bitset Darrick J. Wong
2024-06-21 4:47 ` Christoph Hellwig
2024-06-20 23:05 ` [PATCH 3/9] xfs: pass the fsbno to xfs_perag_intent_get Darrick J. Wong
2024-06-20 23:05 ` [PATCH 4/9] xfs: add a xefi_entry helper Darrick J. Wong
2024-06-20 23:05 ` [PATCH 5/9] xfs: reuse xfs_extent_free_cancel_item Darrick J. Wong
2024-06-20 23:06 ` [PATCH 6/9] xfs: factor out a xfs_efd_add_extent helper Darrick J. Wong
2024-06-20 23:06 ` [PATCH 7/9] xfs: remove duplicate asserts in xfs_defer_extent_free Darrick J. Wong
2024-06-20 23:06 ` [PATCH 8/9] xfs: remove xfs_defer_agfl_block Darrick J. Wong
2024-07-03 8:07 ` kernel test robot
2024-06-20 23:07 ` [PATCH 9/9] xfs: move xfs_extent_free_defer_add to xfs_extfree_item.c Darrick J. Wong
2024-06-21 4:48 ` Christoph Hellwig
2024-06-20 22:57 ` [PATCHSET v3.0 3/5] xfs: rmap log intent cleanups Darrick J. Wong
2024-06-20 23:07 ` [PATCH 1/9] xfs: give rmap btree cursor error tracepoints their own class Darrick J. Wong
2024-06-21 4:48 ` Christoph Hellwig
2024-06-20 23:07 ` [PATCH 2/9] xfs: prepare rmap btree tracepoints for widening Darrick J. Wong
2024-06-21 4:49 ` Christoph Hellwig
2024-06-21 18:07 ` Darrick J. Wong
2024-06-20 23:07 ` [PATCH 3/9] xfs: clean up rmap log intent item tracepoint callsites Darrick J. Wong
2024-06-21 4:50 ` Christoph Hellwig
2024-06-20 23:08 ` Darrick J. Wong [this message]
2024-06-21 4:50 ` [PATCH 4/9] xfs: remove xfs_trans_set_rmap_flags Christoph Hellwig
2024-06-20 23:08 ` [PATCH 5/9] xfs: add a ri_entry helper Darrick J. Wong
2024-06-20 23:08 ` [PATCH 6/9] xfs: reuse xfs_rmap_update_cancel_item Darrick J. Wong
2024-06-20 23:08 ` [PATCH 7/9] xfs: don't bother calling xfs_rmap_finish_one_cleanup in xfs_rmap_finish_one Darrick J. Wong
2024-06-20 23:09 ` [PATCH 8/9] xfs: simplify usage of the rcur local variable " Darrick J. Wong
2024-06-20 23:09 ` [PATCH 9/9] xfs: move xfs_rmap_update_defer_add to xfs_rmap_item.c Darrick J. Wong
2024-06-21 4:51 ` Christoph Hellwig
2024-06-20 22:58 ` [PATCHSET v3.0 4/5] xfs: refcount log intent cleanups Darrick J. Wong
2024-06-20 23:09 ` [PATCH 01/10] xfs: give refcount btree cursor error tracepoints their own class Darrick J. Wong
2024-06-21 4:51 ` Christoph Hellwig
2024-06-20 23:09 ` [PATCH 02/10] xfs: create specialized classes for refcount tracepoints Darrick J. Wong
2024-06-21 4:51 ` Christoph Hellwig
2024-06-20 23:10 ` [PATCH 03/10] xfs: prepare refcount btree tracepoints for widening Darrick J. Wong
2024-06-21 4:52 ` Christoph Hellwig
2024-06-20 23:10 ` [PATCH 04/10] xfs: clean up refcount log intent item tracepoint callsites Darrick J. Wong
2024-06-21 4:52 ` Christoph Hellwig
2024-06-20 23:10 ` [PATCH 05/10] xfs: remove xfs_trans_set_refcount_flags Darrick J. Wong
2024-06-21 4:53 ` Christoph Hellwig
2024-06-20 23:10 ` [PATCH 06/10] xfs: add a ci_entry helper Darrick J. Wong
2024-06-21 4:53 ` Christoph Hellwig
2024-06-20 23:11 ` [PATCH 07/10] xfs: reuse xfs_refcount_update_cancel_item Darrick J. Wong
2024-06-21 4:54 ` Christoph Hellwig
2024-06-20 23:11 ` [PATCH 08/10] xfs: don't bother calling xfs_refcount_finish_one_cleanup in xfs_refcount_finish_one Darrick J. Wong
2024-06-21 4:54 ` Christoph Hellwig
2024-06-20 23:11 ` [PATCH 09/10] xfs: simplify usage of the rcur local variable " Darrick J. Wong
2024-06-21 4:54 ` Christoph Hellwig
2024-06-20 23:11 ` [PATCH 10/10] xfs: move xfs_refcount_update_defer_add to xfs_refcount_item.c Darrick J. Wong
2024-06-21 4:54 ` Christoph Hellwig
2024-06-20 22:58 ` [PATCHSET v3.0 5/5] xfs: enable FITRIM for the realtime section Darrick J. Wong
2024-06-20 23:12 ` [PATCH 1/1] xfs: enable FITRIM on the realtime device Darrick J. Wong
2024-06-21 5:00 ` Christoph Hellwig
2024-06-21 18:23 ` Darrick J. Wong
2024-06-24 15:04 ` [PATCH v2 " Darrick J. Wong
2024-06-24 15:12 ` Christoph Hellwig
2024-06-27 6:13 ` Chandan Babu R
2024-06-27 6:35 ` Christoph Hellwig
2024-06-27 6:38 ` Christoph Hellwig
2024-06-27 20:54 ` Darrick J. Wong
[not found] ` <2O52BJOH5Y79X.3A332GBFVJ9K7@gmail.com>
[not found] ` <20240723032327.GU1998502@frogsfrogsfrogs>
[not found] ` <2NTNQAOVQB88C.3NX279FOIEOI0@gmail.com>
[not found] ` <20240723232805.GX1998502@frogsfrogsfrogs>
[not found] ` <1YL3BJOD4E6EC.2JWNIADIUU7OD@gmail.com>
[not found] ` <20240724235707.GG1646003@frogsfrogsfrogs>
[not found] ` <3UKNEUV4T2OLQ.30FMK239EJTGG@gmail.com>
[not found] ` <20240806163246.GD623936@frogsfrogsfrogs>
[not found] ` <20240806230656.GD623922@frogsfrogsfrogs>
2024-08-19 16:01 ` [PATCH " Konst Mayer
2024-06-21 3:09 ` [PATCHSET v3.0 5/5] xfs: enable FITRIM for the realtime section Konst Mayer
2024-06-21 18:26 ` 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=171892419301.3184396.4725607583390300491.stgit@frogsfrogsfrogs \
--to=djwong@kernel.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox