From: Ritesh Harjani <riteshh@linux.ibm.com>
To: linux-ext4@vger.kernel.org
Cc: "Paul E . McKenney" <paulmck@kernel.org>,
linux-fsdevel@vger.kernel.org, Jan Kara <jack@suse.com>,
tytso@mit.edu, "Aneesh Kumar K . V" <aneesh.kumar@linux.ibm.com>,
Ritesh Harjani <riteshh@linux.ibm.com>
Subject: [RFC 10/20] ext4: mballoc: Remove EXT4_MB_HINT_GOAL_ONLY and it's related code
Date: Fri, 1 May 2020 11:59:52 +0530 [thread overview]
Message-ID: <3bcf0e3c4a3f7326af909f091767fbf348a3497a.1588313626.git.riteshh@linux.ibm.com> (raw)
In-Reply-To: <cover.1588313626.git.riteshh@linux.ibm.com>
We don't set EXT4_MB_HINT_GOAL_ONLY flag at any place and from our last
during discussion, we don't see a need/use case of it anytime in near
future too.
So just kill the flag and all of it's references.
This also adjusts the remaining ac_flags macro values accordingly.
Signed-off-by: Ritesh Harjani <riteshh@linux.ibm.com>
---
fs/ext4/ext4.h | 12 +++++-------
fs/ext4/mballoc.c | 10 ----------
include/trace/events/ext4.h | 1 -
3 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 91eb4381cae5..db4fb62c1169 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -130,18 +130,16 @@ enum SHIFT_DIRECTION {
#define EXT4_MB_HINT_NOPREALLOC 0x0040
/* allocate for locality group */
#define EXT4_MB_HINT_GROUP_ALLOC 0x0080
-/* allocate goal blocks or none */
-#define EXT4_MB_HINT_GOAL_ONLY 0x0100
/* goal is meaningful */
-#define EXT4_MB_HINT_TRY_GOAL 0x0200
+#define EXT4_MB_HINT_TRY_GOAL 0x0100
/* blocks already pre-reserved by delayed allocation */
-#define EXT4_MB_DELALLOC_RESERVED 0x0400
+#define EXT4_MB_DELALLOC_RESERVED 0x0200
/* We are doing stream allocation */
-#define EXT4_MB_STREAM_ALLOC 0x0800
+#define EXT4_MB_STREAM_ALLOC 0x0400
/* Use reserved root blocks if needed */
-#define EXT4_MB_USE_ROOT_BLOCKS 0x1000
+#define EXT4_MB_USE_ROOT_BLOCKS 0x0800
/* Use blocks from reserved pool */
-#define EXT4_MB_USE_RESERVED 0x2000
+#define EXT4_MB_USE_RESERVED 0x1000
struct ext4_allocation_request {
/* target inode for block we're allocating */
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index 6e7232fd109e..4d6effe22652 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -2157,9 +2157,6 @@ ext4_mb_regular_allocator(struct ext4_allocation_context *ac)
if (err || ac->ac_status == AC_STATUS_FOUND)
goto out;
- if (unlikely(ac->ac_flags & EXT4_MB_HINT_GOAL_ONLY))
- goto out;
-
/*
* ac->ac2_order is set only if the fe_len is a power of 2
* if ac2_order is set we also set criteria to 0 so that we
@@ -3139,10 +3136,6 @@ ext4_mb_normalize_request(struct ext4_allocation_context *ac,
if (!(ac->ac_flags & EXT4_MB_HINT_DATA))
return;
- /* sometime caller may want exact blocks */
- if (unlikely(ac->ac_flags & EXT4_MB_HINT_GOAL_ONLY))
- return;
-
/* caller may indicate that preallocation isn't
* required (it's a tail, for example) */
if (ac->ac_flags & EXT4_MB_HINT_NOPREALLOC)
@@ -4257,9 +4250,6 @@ static void ext4_mb_group_or_file(struct ext4_allocation_context *ac)
if (!(ac->ac_flags & EXT4_MB_HINT_DATA))
return;
- if (unlikely(ac->ac_flags & EXT4_MB_HINT_GOAL_ONLY))
- return;
-
size = ac->ac_o_ex.fe_logical + EXT4_C2B(sbi, ac->ac_o_ex.fe_len);
isize = (i_size_read(ac->ac_inode) + ac->ac_sb->s_blocksize - 1)
>> bsbits;
diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h
index 19c87661eeec..a2a603172f57 100644
--- a/include/trace/events/ext4.h
+++ b/include/trace/events/ext4.h
@@ -30,7 +30,6 @@ struct partial_cluster;
{ EXT4_MB_HINT_DATA, "HINT_DATA" }, \
{ EXT4_MB_HINT_NOPREALLOC, "HINT_NOPREALLOC" }, \
{ EXT4_MB_HINT_GROUP_ALLOC, "HINT_GRP_ALLOC" }, \
- { EXT4_MB_HINT_GOAL_ONLY, "HINT_GOAL_ONLY" }, \
{ EXT4_MB_HINT_TRY_GOAL, "HINT_TRY_GOAL" }, \
{ EXT4_MB_DELALLOC_RESERVED, "DELALLOC_RESV" }, \
{ EXT4_MB_STREAM_ALLOC, "STREAM_ALLOC" }, \
--
2.21.0
next prev parent reply other threads:[~2020-05-01 6:30 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-01 6:29 [RFC 00/20] ext4: Fix ENOSPC error, improve mballoc dbg, other cleanups Ritesh Harjani
2020-05-01 6:29 ` [RFC 01/20] ext4: mballoc: Refactor ext4_mb_discard_preallocations() Ritesh Harjani
2020-05-01 6:29 ` [RFC 02/20] ext4: Introduce percpu seq counter for freeing blocks(PA) to avoid ENOSPC err Ritesh Harjani
2020-05-01 18:31 ` Paul E. McKenney
2020-05-04 22:34 ` Ritesh Harjani
2020-05-05 0:36 ` Paul E. McKenney
2020-05-01 6:29 ` [RFC 03/20] ext4: mballoc: Do print bb_free info even when it is 0 Ritesh Harjani
2020-05-01 6:29 ` [RFC 04/20] ext4: mballoc: Refactor ext4_mb_show_ac() Ritesh Harjani
2020-05-01 6:29 ` [RFC 05/20] ext4: mballoc: Add more mb_debug() msgs Ritesh Harjani
2020-05-01 6:29 ` [RFC 06/20] ext4: mballoc: Correct the mb_debug() format specifier for pa_len var Ritesh Harjani
2020-05-01 6:29 ` [RFC 07/20] ext4: mballoc: Fix few other format specifier in mb_debug() Ritesh Harjani
2020-05-01 6:29 ` [RFC 08/20] ext4: mballoc: Simplify error handling in ext4_init_mballoc() Ritesh Harjani
2020-05-01 6:29 ` [RFC 09/20] ext4: mballoc: Make ext4_mb_use_preallocated() return type as bool Ritesh Harjani
2020-05-01 6:29 ` Ritesh Harjani [this message]
2020-05-01 6:29 ` [RFC 11/20] ext4: mballoc: Refactor code inside DOUBLE_CHECK into separate function Ritesh Harjani
2020-05-01 6:29 ` [RFC 12/20] ext4: mballoc: Fix possible NULL ptr dereference from mb_cmp_bitmaps() Ritesh Harjani
2020-05-01 6:29 ` [RFC 13/20] ext4: mballoc: Don't BUG if kmalloc or read blk bitmap fail for DOUBLE_CHECK Ritesh Harjani
2020-05-01 6:29 ` [RFC 14/20] ext4: balloc: Use task_pid_nr() helper Ritesh Harjani
2020-05-01 6:29 ` [RFC 15/20] ext4: Use BIT() macro for BH_** state bits Ritesh Harjani
2020-05-01 6:29 ` [RFC 16/20] ext4: Improve ext_debug() msg in case of block allocation failure Ritesh Harjani
2020-05-01 6:29 ` [RFC 17/20] ext4: Replace EXT_DEBUG with __maybe_unused in ext4_ext_handle_unwritten_extents() Ritesh Harjani
2020-05-01 6:30 ` [RFC 18/20] ext4: mballoc: Make mb_debug() implementation to use pr_debug() Ritesh Harjani
2020-05-01 6:30 ` [RFC 19/20] ext4: Make ext_debug() " Ritesh Harjani
2020-05-01 6:30 ` [RFC 20/20] ext4: Add process name and pid in ext4_msg() Ritesh Harjani
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=3bcf0e3c4a3f7326af909f091767fbf348a3497a.1588313626.git.riteshh@linux.ibm.com \
--to=riteshh@linux.ibm.com \
--cc=aneesh.kumar@linux.ibm.com \
--cc=jack@suse.com \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=paulmck@kernel.org \
--cc=tytso@mit.edu \
/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;
as well as URLs for NNTP newsgroup(s).