From: Ivan Shapovalov <intelfx100@gmail.com>
To: reiserfs-devel@vger.kernel.org
Cc: Ivan Shapovalov <intelfx100@gmail.com>
Subject: [PATCHv4 02/10] reiser4: block_alloc: add a "monotonic_forward" parameter to reiser4_blocknr_hint to allocate blocks only in forward direction.
Date: Sat, 13 Dec 2014 00:00:38 +0300 [thread overview]
Message-ID: <1418418046-10933-3-git-send-email-intelfx100@gmail.com> (raw)
In-Reply-To: <1418418046-10933-1-git-send-email-intelfx100@gmail.com>
Signed-off-by: Ivan Shapovalov <intelfx100@gmail.com>
---
fs/reiser4/block_alloc.c | 4 ++--
fs/reiser4/block_alloc.h | 5 +++--
fs/reiser4/plugin/space/bitmap.c | 10 ++++++----
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/fs/reiser4/block_alloc.c b/fs/reiser4/block_alloc.c
index 14dd378..56795ca 100644
--- a/fs/reiser4/block_alloc.c
+++ b/fs/reiser4/block_alloc.c
@@ -264,7 +264,7 @@ int reiser4_check_block_counters(const struct super_block *super)
static int
reiser4_grab(reiser4_context * ctx, __u64 count, reiser4_ba_flags_t flags)
{
- __s64 allowed_blocks;
+ __u64 allowed_blocks;
int ret = 0, use_reserved = flags & BA_RESERVED;
reiser4_super_info_data *sbinfo;
@@ -285,7 +285,7 @@ reiser4_grab(reiser4_context * ctx, __u64 count, reiser4_ba_flags_t flags)
if (flags & BA_SOME_SPACE) {
/* Reserve 25% of all free space */
- if (allowed_blocks <= 0) {
+ if (allowed_blocks == 0) {
/* No space at all */
ret = RETERR(-ENOSPC);
goto unlock_and_ret;
diff --git a/fs/reiser4/block_alloc.h b/fs/reiser4/block_alloc.h
index bfc6be9..903bc8f 100644
--- a/fs/reiser4/block_alloc.h
+++ b/fs/reiser4/block_alloc.h
@@ -51,9 +51,10 @@ struct reiser4_blocknr_hint {
/* block allocator assumes that blocks, which will be mapped to disk,
are in this specified block_stage */
block_stage_t block_stage;
- /* If direction = 1 allocate blocks in backward direction from the end
- * of disk to the beginning of disk. */
+ /* allocate blocks in backward direction */
unsigned int backward:1;
+ /* allocate blocks only in forward direction starting from blk */
+ unsigned int monotonic_forward:1;
};
diff --git a/fs/reiser4/plugin/space/bitmap.c b/fs/reiser4/plugin/space/bitmap.c
index 3da3f6b..e56c336 100644
--- a/fs/reiser4/plugin/space/bitmap.c
+++ b/fs/reiser4/plugin/space/bitmap.c
@@ -1124,10 +1124,12 @@ static int alloc_blocks_forward(reiser4_blocknr_hint *hint, int needed,
actual_len =
bitmap_alloc_forward(&search_start, &search_end, 1, needed);
- /* There is only one bitmap search if max_dist was specified or first
- pass was from the beginning of the bitmap. We also do one pass for
- scanning bitmap in backward direction. */
- if (!(actual_len != 0 || hint->max_dist != 0 || search_start == 0)) {
+ /* There is only one bitmap search if max_dist was specified, first
+ pass was from the beginning of the bitmap, or if the monotonic flag
+ has been set. Otherwise we also do one pass for scanning bitmap in
+ backward direction. */
+ if (actual_len == 0 && search_start != 0 &&
+ hint->max_dist == 0 && !hint->monotonic_forward) {
/* next step is a scanning from 0 to search_start */
search_end = search_start;
search_start = 0;
--
2.1.3
next prev parent reply other threads:[~2014-12-12 21:00 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-12 21:00 [PATCHv4 00/10] reiser4: batch discard support (FITRIM ioctl): initial implementation Ivan Shapovalov
2014-12-12 21:00 ` [PATCHv4 01/10] reiser4: block_alloc: add BA_SOME_SPACE flag for grabbing a fixed amount of space Ivan Shapovalov
2014-12-12 21:00 ` Ivan Shapovalov [this message]
2014-12-12 21:00 ` [PATCHv4 03/10] reiser4: block_alloc: move block accounting by pre-commit hook into block_alloc.c and document BA_DEFER behavior Ivan Shapovalov
2014-12-12 21:00 ` [PATCHv4 04/10] reiser4: txnmgr: free allocated but unneeded atom in atom_begin_and_assign_to_txnh() Ivan Shapovalov
2014-12-12 21:00 ` [PATCHv4 05/10] reiser4: txnmgr: add reiser4_create_atom() which creates an empty atom without capturing any nodes Ivan Shapovalov
2014-12-12 21:00 ` [PATCHv4 06/10] reiser4: txnmgr: move "empty atom" shortcut slightly below Ivan Shapovalov
2014-12-12 21:00 ` [PATCHv4 07/10] reiser4: batch discard support: add a dummy FITRIM ioctl handler for directories Ivan Shapovalov
2014-12-12 21:00 ` [PATCHv4 08/10] reiser4: batch discard support: actually implement the FITRIM ioctl handler Ivan Shapovalov
2014-12-12 21:00 ` [PATCHv4 09/10] reiser4: block_alloc: add a "min_len" parameter to reiser4_blocknr_hint to limit allocated extent length from below Ivan Shapovalov
2014-12-12 21:00 ` [PATCHv4 10/10] reiser4: batch discard support: honor minimal extent length passed from the userspace Ivan Shapovalov
2014-12-12 21:02 ` [PATCHv4 00/10] reiser4: batch discard support (FITRIM ioctl): initial implementation Ivan Shapovalov
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=1418418046-10933-3-git-send-email-intelfx100@gmail.com \
--to=intelfx100@gmail.com \
--cc=reiserfs-devel@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;
as well as URLs for NNTP newsgroup(s).