diff mbox series

[2/2] btrfs: Remove EXTENT_IOBITS

Message ID 20190314132831.8749-2-nborisov@suse.com (mailing list archive)
State New, archived
Headers show
Series None | expand

Commit Message

Nikolay Borisov March 14, 2019, 1:28 p.m. UTC 
This flag just became synonymous to EXTENT_LOCKED, so just remove it and
used EXTENT_LOCKED directly. No functional changes.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
---
 fs/btrfs/extent_io.c | 11 +++++------
 fs/btrfs/extent_io.h |  1 -
 2 files changed, 5 insertions(+), 7 deletions(-)

Comments

David Sterba March 18, 2019, 6:39 p.m. UTC | #1 
On Thu, Mar 14, 2019 at 03:28:31PM +0200, Nikolay Borisov wrote:
> This flag just became synonymous to EXTENT_LOCKED, so just remove it and
> used EXTENT_LOCKED directly. No functional changes.

Ok. The only reason to have an alias would be to make it explicit that
it's for IO, but _LOCKED is used in that context too in other places so
I don't think we're losing any information here.

Reviewed-by: David Sterba <dsterba@suse.com>

1 and 2 added to misc-next, thanks.
diff mbox series

Patch

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index d3cd6cb6c1d8..a04e0328f1bb 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -427,7 +427,7 @@  static void merge_state(struct extent_io_tree *tree,
 	struct extent_state *other;
 	struct rb_node *other_node;
 
-	if (state->state & (EXTENT_IOBITS | EXTENT_BOUNDARY))
+	if (state->state & (EXTENT_LOCKED | EXTENT_BOUNDARY))
 		return;
 
 	other_node = rb_prev(&state->rb_node);
@@ -645,7 +645,7 @@  int __clear_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
 	if (delete)
 		bits |= ~EXTENT_CTLBITS;
 
-	if (bits & (EXTENT_IOBITS | EXTENT_BOUNDARY))
+	if (bits & (EXTENT_LOCKED | EXTENT_BOUNDARY))
 		clear = 1;
 again:
 	if (!prealloc && gfpflags_allow_blocking(mask)) {
@@ -877,7 +877,7 @@  static void cache_state(struct extent_state *state,
 			struct extent_state **cached_ptr)
 {
 	return cache_state_if_flags(state, cached_ptr,
-				    EXTENT_IOBITS | EXTENT_BOUNDARY);
+				    EXTENT_LOCKED | EXTENT_BOUNDARY);
 }
 
 /*
@@ -4233,10 +4233,9 @@  static int try_release_extent_state(struct extent_io_tree *tree,
 	u64 end = start + PAGE_SIZE - 1;
 	int ret = 1;
 
-	if (test_range_bit(tree, start, end,
-			   EXTENT_IOBITS, 0, NULL))
+	if (test_range_bit(tree, start, end, EXTENT_LOCKED, 0, NULL)) {
 		ret = 0;
-	else {
+	} else {
 		/*
 		 * at this point we can safely clear everything except the
 		 * locked bit and the nodatasum bit
diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
index 0ed7a572673d..f41797690839 100644
--- a/fs/btrfs/extent_io.h
+++ b/fs/btrfs/extent_io.h
@@ -23,7 +23,6 @@ 
 #define EXTENT_QGROUP_RESERVED	(1U << 12)
 #define EXTENT_CLEAR_DATA_RESV	(1U << 13)
 #define EXTENT_DELALLOC_NEW	(1U << 14)
-#define EXTENT_IOBITS		(EXTENT_LOCKED)
 #define EXTENT_DO_ACCOUNTING    (EXTENT_CLEAR_META_RESV | \
 				 EXTENT_CLEAR_DATA_RESV)
 #define EXTENT_CTLBITS		(EXTENT_DO_ACCOUNTING)