* [PATCH] btrfs: Rename __set_extent_bit to set_extent_bit
@ 2020-11-05 9:08 Nikolay Borisov
2020-11-12 19:21 ` David Sterba
0 siblings, 1 reply; 2+ messages in thread
From: Nikolay Borisov @ 2020-11-05 9:08 UTC (permalink / raw)
To: linux-btrfs; +Cc: Nikolay Borisov
There are only 2 direct calls to set_extent_bit outside of extent-io - in
btrfs_find_new_delalloc_bytes and btrfs_truncate_block, the rest are thin wrappers
around __set_extent_bit. This adds unnecessary indirection and just makes it
more annoying when looking at the various extent bit manipulation functions.
This patch renames __set_extent_bit to set_extent_bit effectively removing
a level of indirection. No functional changes.
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
---
fs/btrfs/extent-io-tree.h | 21 +++++++++++++--------
fs/btrfs/extent_io.c | 32 ++++++++++++--------------------
fs/btrfs/file.c | 3 ++-
fs/btrfs/inode.c | 2 +-
4 files changed, 28 insertions(+), 30 deletions(-)
diff --git a/fs/btrfs/extent-io-tree.h b/fs/btrfs/extent-io-tree.h
index cab4273ff8d3..62a02b333eeb 100644
--- a/fs/btrfs/extent-io-tree.h
+++ b/fs/btrfs/extent-io-tree.h
@@ -154,14 +154,17 @@ static inline int clear_extent_bits(struct extent_io_tree *tree, u64 start,
int set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
unsigned bits, struct extent_changeset *changeset);
int set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
- unsigned bits, struct extent_state **cached_state, gfp_t mask);
+ unsigned bits, unsigned exclusive_bits, u64 *failed_start,
+ struct extent_state **cached_state, gfp_t mask,
+ struct extent_changeset *changeset);
int set_extent_bits_nowait(struct extent_io_tree *tree, u64 start, u64 end,
unsigned bits);
static inline int set_extent_bits(struct extent_io_tree *tree, u64 start,
u64 end, unsigned bits)
{
- return set_extent_bit(tree, start, end, bits, NULL, GFP_NOFS);
+ return set_extent_bit(tree, start, end, bits, 0, NULL, NULL, GFP_NOFS,
+ NULL);
}
static inline int clear_extent_uptodate(struct extent_io_tree *tree, u64 start,
@@ -174,7 +177,8 @@ static inline int clear_extent_uptodate(struct extent_io_tree *tree, u64 start,
static inline int set_extent_dirty(struct extent_io_tree *tree, u64 start,
u64 end, gfp_t mask)
{
- return set_extent_bit(tree, start, end, EXTENT_DIRTY, NULL, mask);
+ return set_extent_bit(tree, start, end, EXTENT_DIRTY, 0, NULL, NULL,
+ mask, NULL);
}
static inline int clear_extent_dirty(struct extent_io_tree *tree, u64 start,
@@ -195,7 +199,7 @@ static inline int set_extent_delalloc(struct extent_io_tree *tree, u64 start,
{
return set_extent_bit(tree, start, end,
EXTENT_DELALLOC | EXTENT_UPTODATE | extra_bits,
- cached_state, GFP_NOFS);
+ 0, NULL, cached_state, GFP_NOFS, NULL);
}
static inline int set_extent_defrag(struct extent_io_tree *tree, u64 start,
@@ -203,20 +207,21 @@ static inline int set_extent_defrag(struct extent_io_tree *tree, u64 start,
{
return set_extent_bit(tree, start, end,
EXTENT_DELALLOC | EXTENT_UPTODATE | EXTENT_DEFRAG,
- cached_state, GFP_NOFS);
+ 0, NULL, cached_state, GFP_NOFS, NULL);
}
static inline int set_extent_new(struct extent_io_tree *tree, u64 start,
u64 end)
{
- return set_extent_bit(tree, start, end, EXTENT_NEW, NULL, GFP_NOFS);
+ return set_extent_bit(tree, start, end, EXTENT_NEW, 0, NULL, NULL,
+ GFP_NOFS, NULL);
}
static inline int set_extent_uptodate(struct extent_io_tree *tree, u64 start,
u64 end, struct extent_state **cached_state, gfp_t mask)
{
- return set_extent_bit(tree, start, end, EXTENT_UPTODATE,
- cached_state, mask);
+ return set_extent_bit(tree, start, end, EXTENT_UPTODATE, 0, NULL,
+ cached_state, mask, NULL);
}
int find_first_extent_bit(struct extent_io_tree *tree, u64 start,
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index f3515d3c1321..ec76f76acd06 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -962,11 +962,11 @@ static void cache_state(struct extent_state *state,
* [start, end] is inclusive This takes the tree lock.
*/
-static int __must_check
-__set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
- unsigned bits, unsigned exclusive_bits,
- u64 *failed_start, struct extent_state **cached_state,
- gfp_t mask, struct extent_changeset *changeset)
+int __must_check
+set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end, unsigned bits,
+ unsigned exclusive_bits, u64 *failed_start,
+ struct extent_state **cached_state, gfp_t mask,
+ struct extent_changeset *changeset)
{
struct extent_state *state;
struct extent_state *prealloc = NULL;
@@ -1183,14 +1183,6 @@ __set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
}
-int set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
- unsigned bits, struct extent_state **cached_state, gfp_t mask)
-{
- return __set_extent_bit(tree, start, end, bits, 0, NULL, cached_state,
- mask, NULL);
-}
-
-
/**
* convert_extent_bit - convert all bits in a given range from one bit to
* another
@@ -1421,14 +1413,14 @@ int set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
*/
BUG_ON(bits & EXTENT_LOCKED);
- return __set_extent_bit(tree, start, end, bits, 0, NULL, NULL, GFP_NOFS,
+ return set_extent_bit(tree, start, end, bits, 0, NULL, NULL, GFP_NOFS,
changeset);
}
int set_extent_bits_nowait(struct extent_io_tree *tree, u64 start, u64 end,
unsigned bits)
{
- return __set_extent_bit(tree, start, end, bits, 0, NULL, NULL,
+ return set_extent_bit(tree, start, end, bits, 0, NULL, NULL,
GFP_NOWAIT, NULL);
}
@@ -1464,9 +1456,9 @@ int lock_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
u64 failed_start;
while (1) {
- err = __set_extent_bit(tree, start, end, EXTENT_LOCKED,
- EXTENT_LOCKED, &failed_start,
- cached_state, GFP_NOFS, NULL);
+ err = set_extent_bit(tree, start, end, EXTENT_LOCKED,
+ EXTENT_LOCKED, &failed_start,
+ cached_state, GFP_NOFS, NULL);
if (err == -EEXIST) {
wait_extent_bit(tree, failed_start, end, EXTENT_LOCKED);
start = failed_start;
@@ -1482,8 +1474,8 @@ int try_lock_extent(struct extent_io_tree *tree, u64 start, u64 end)
int err;
u64 failed_start;
- err = __set_extent_bit(tree, start, end, EXTENT_LOCKED, EXTENT_LOCKED,
- &failed_start, NULL, GFP_NOFS, NULL);
+ err = set_extent_bit(tree, start, end, EXTENT_LOCKED, EXTENT_LOCKED,
+ &failed_start, NULL, GFP_NOFS, NULL);
if (err == -EEXIST) {
if (failed_start > start)
clear_extent_bit(tree, start, failed_start - 1,
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 26d1cb8a8623..c153e3aba177 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -481,7 +481,8 @@ static int btrfs_find_new_delalloc_bytes(struct btrfs_inode *inode,
ret = set_extent_bit(&inode->io_tree, search_start,
search_start + em_len - 1,
- EXTENT_DELALLOC_NEW, cached_state, GFP_NOFS);
+ EXTENT_DELALLOC_NEW, 0,
+ NULL, cached_state, GFP_NOFS, NULL);
next:
search_start = extent_map_end(em);
free_extent_map(em);
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 3b5e73e8dffb..1ff87d1888dc 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -4655,7 +4655,7 @@ int btrfs_truncate_block(struct btrfs_inode *inode, loff_t from, loff_t len,
if (only_release_metadata)
set_extent_bit(io_tree, block_start, block_end,
- EXTENT_NORESERVE, NULL, NULL, GFP_NOFS);
+ EXTENT_NORESERVE, 0, NULL, NULL, GFP_NOFS, NULL);
out_unlock:
if (ret) {
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] btrfs: Rename __set_extent_bit to set_extent_bit
2020-11-05 9:08 [PATCH] btrfs: Rename __set_extent_bit to set_extent_bit Nikolay Borisov
@ 2020-11-12 19:21 ` David Sterba
0 siblings, 0 replies; 2+ messages in thread
From: David Sterba @ 2020-11-12 19:21 UTC (permalink / raw)
To: Nikolay Borisov; +Cc: linux-btrfs
On Thu, Nov 05, 2020 at 11:08:00AM +0200, Nikolay Borisov wrote:
> There are only 2 direct calls to set_extent_bit outside of extent-io - in
> btrfs_find_new_delalloc_bytes and btrfs_truncate_block, the rest are thin wrappers
> around __set_extent_bit. This adds unnecessary indirection and just makes it
> more annoying when looking at the various extent bit manipulation functions.
> This patch renames __set_extent_bit to set_extent_bit effectively removing
> a level of indirection. No functional changes.
Makes sense, we can avoid the raw calls to set_extent_bit by adding the
static inline wrappers set_extent_bit_noreserve and
set_extent_bit_delalloc_new. Qu has some cleanups in the io tree helpers
so further cleanups can be done and I'll add this patch to misc-next as
it's a good first step.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-11-12 19:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-05 9:08 [PATCH] btrfs: Rename __set_extent_bit to set_extent_bit Nikolay Borisov
2020-11-12 19:21 ` David Sterba
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.