From: Ivan Shapovalov <intelfx100@gmail.com>
To: reiserfs-devel@vger.kernel.org
Cc: Ivan Shapovalov <intelfx100@gmail.com>
Subject: [PATCHv5 01/10] reiser4: block_alloc: add BA_SOME_SPACE flag for grabbing a fixed amount of space.
Date: Fri, 13 Feb 2015 03:48:10 +0300 [thread overview]
Message-ID: <1423788499-30430-2-git-send-email-intelfx100@gmail.com> (raw)
In-Reply-To: <1423788499-30430-1-git-send-email-intelfx100@gmail.com>
This is used for FITRIM ioctl which will iteratively grab, allocate and trim disk space
bit by bit to avoid starving the rest of system.
Signed-off-by: Ivan Shapovalov <intelfx100@gmail.com>
---
fs/reiser4/block_alloc.c | 22 ++++++++++++++++++----
fs/reiser4/block_alloc.h | 5 ++++-
2 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/fs/reiser4/block_alloc.c b/fs/reiser4/block_alloc.c
index 324b11c..14dd378 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)
{
- __u64 free_blocks;
+ __s64 allowed_blocks;
int ret = 0, use_reserved = flags & BA_RESERVED;
reiser4_super_info_data *sbinfo;
@@ -280,10 +280,24 @@ reiser4_grab(reiser4_context * ctx, __u64 count, reiser4_ba_flags_t flags)
spin_lock_reiser4_super(sbinfo);
- free_blocks = sbinfo->blocks_free;
+ allowed_blocks = use_reserved ? sbinfo->blocks_free
+ : sbinfo->blocks_free - sbinfo->blocks_reserved;
- if ((use_reserved && free_blocks < count) ||
- (!use_reserved && free_blocks < count + sbinfo->blocks_reserved)) {
+ if (flags & BA_SOME_SPACE) {
+ /* Reserve 25% of all free space */
+ if (allowed_blocks <= 0) {
+ /* No space at all */
+ ret = RETERR(-ENOSPC);
+ goto unlock_and_ret;
+ }
+
+ count = allowed_blocks >> 2;
+ if (count == 0) {
+ /* Less than 4 free blocks */
+ count = allowed_blocks;
+ }
+ } else if (count > allowed_blocks) {
+ /* Not enough space */
ret = RETERR(-ENOSPC);
goto unlock_and_ret;
}
diff --git a/fs/reiser4/block_alloc.h b/fs/reiser4/block_alloc.h
index a4e98af..bfc6be9 100644
--- a/fs/reiser4/block_alloc.h
+++ b/fs/reiser4/block_alloc.h
@@ -79,7 +79,10 @@ enum reiser4_ba_flags {
BA_FORCE = (1 << 5),
/* use default start value for free blocks search. */
- BA_USE_DEFAULT_SEARCH_START = (1 << 6)
+ BA_USE_DEFAULT_SEARCH_START = (1 << 6),
+
+ /* reserve some fixed amount of space */
+ BA_SOME_SPACE = (1 << 7),
};
typedef enum reiser4_ba_flags reiser4_ba_flags_t;
--
2.3.0
next prev parent reply other threads:[~2015-02-13 0:48 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-13 0:48 [PATCHv5 00/10] reiser4: batch discard support (FITRIM ioctl): initial implementation Ivan Shapovalov
2015-02-13 0:48 ` Ivan Shapovalov [this message]
2015-02-13 0:48 ` [PATCHv5 02/10] reiser4: block_alloc: add a "monotonic_forward" parameter to reiser4_blocknr_hint to allocate blocks only in forward direction Ivan Shapovalov
2015-02-13 0:48 ` [PATCHv5 03/10] reiser4: block_alloc: move block accounting by pre-commit hook into block_alloc.c and document BA_DEFER behavior Ivan Shapovalov
2015-02-13 0:48 ` [PATCHv5 04/10] reiser4: txnmgr: free allocated but unneeded atom in atom_begin_and_assign_to_txnh() Ivan Shapovalov
2015-02-13 0:48 ` [PATCHv5 05/10] reiser4: txnmgr: add reiser4_create_atom() which creates an empty atom without capturing any nodes Ivan Shapovalov
2015-02-13 0:48 ` [PATCHv5 06/10] reiser4: txnmgr: move "empty atom" shortcut slightly below Ivan Shapovalov
2015-02-13 0:48 ` [PATCHv5 07/10] reiser4: batch discard support: add a dummy FITRIM ioctl handler for directories Ivan Shapovalov
2015-02-13 0:48 ` [PATCHv5 08/10] reiser4: batch discard support: actually implement the FITRIM ioctl handler Ivan Shapovalov
2015-02-13 0:48 ` [PATCHv5 09/10] reiser4: block_alloc: add a "min_len" parameter to reiser4_blocknr_hint to limit allocated extent length from below Ivan Shapovalov
2015-02-13 0:48 ` [PATCHv5 10/10] reiser4: batch discard support: honor minimal extent length passed from the userspace Ivan Shapovalov
2015-02-13 2:11 ` When is the patch set included in the reiser4-for-3.x... release ? doiggl
2015-02-13 3:01 ` Ivan Shapovalov
2015-02-13 5:08 ` help with testing doiggl
2015-02-13 9:39 ` [PATCHv5 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=1423788499-30430-2-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).