From: "Gabríel Arthúr Pétursson" <gabriel@system.is>
To: linux-btrfs@vger.kernel.org
Cc: "Gabríel Arthúr Pétursson" <gabriel@system.is>
Subject: [PATCH] btrfs: add stripes filter
Date: Mon, 28 Sep 2015 22:32:41 +0000 [thread overview]
Message-ID: <1443479561-785-1-git-send-email-gabriel@system.is> (raw)
In-Reply-To: <1443463025.16163.6.camel@system.is>
---
fs/btrfs/ctree.h | 6 +++++-
fs/btrfs/volumes.c | 18 ++++++++++++++++++
fs/btrfs/volumes.h | 1 +
include/uapi/linux/btrfs.h | 6 +++++-
4 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 938efe3..78573e5 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -849,7 +849,11 @@ struct btrfs_disk_balance_args {
/* BTRFS_BALANCE_ARGS_LIMIT value */
__le64 limit;
- __le64 unused[7];
+ /* btrfs stripes filter */
+ __le64 sstart;
+ __le64 send;
+
+ __le64 unused[5];
} __attribute__ ((__packed__));
/*
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 6fc73586..dc65fbb 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -3170,6 +3170,18 @@ static int chunk_vrange_filter(struct extent_buffer *leaf,
return 1;
}
+static int chunk_stripes_filter(struct extent_buffer *leaf,
+ struct btrfs_chunk *chunk,
+ struct btrfs_balance_args *bargs)
+{
+ int num_stripes = btrfs_chunk_num_stripes(leaf, chunk);
+
+ if (bargs->sstart <= num_stripes && num_stripes <= bargs->send)
+ return 0;
+
+ return 1;
+}
+
static int chunk_soft_convert_filter(u64 chunk_type,
struct btrfs_balance_args *bargs)
{
@@ -3236,6 +3248,12 @@ static int should_balance_chunk(struct btrfs_root *root,
return 0;
}
+ /* stripes filter */
+ if ((bargs->flags & BTRFS_BALANCE_ARGS_STRIPES) &&
+ chunk_stripes_filter(leaf, chunk, bargs)) {
+ return 0;
+ }
+
/* soft profile changing mode */
if ((bargs->flags & BTRFS_BALANCE_ARGS_SOFT) &&
chunk_soft_convert_filter(chunk_type, bargs)) {
diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h
index 2ca784a..fb6b89a 100644
--- a/fs/btrfs/volumes.h
+++ b/fs/btrfs/volumes.h
@@ -375,6 +375,7 @@ struct map_lookup {
#define BTRFS_BALANCE_ARGS_DRANGE (1ULL << 3)
#define BTRFS_BALANCE_ARGS_VRANGE (1ULL << 4)
#define BTRFS_BALANCE_ARGS_LIMIT (1ULL << 5)
+#define BTRFS_BALANCE_ARGS_STRIPES (1ULL << 6)
/*
* Profile changing flags. When SOFT is set we won't relocate chunk if
diff --git a/include/uapi/linux/btrfs.h b/include/uapi/linux/btrfs.h
index b6dec05..a7819d0 100644
--- a/include/uapi/linux/btrfs.h
+++ b/include/uapi/linux/btrfs.h
@@ -218,7 +218,11 @@ struct btrfs_balance_args {
__u64 flags;
__u64 limit; /* limit number of processed chunks */
- __u64 unused[7];
+
+ __u64 sstart;
+ __u64 send;
+
+ __u64 unused[5];
} __attribute__ ((__packed__));
/* report balance progress to userspace */
--
2.5.3
next prev parent reply other threads:[~2015-09-28 22:32 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-28 17:57 Add stripes filter Gabríel Arthúr Pétursson
2015-09-28 21:11 ` Omar Sandoval
2015-09-28 22:32 ` Gabríel Arthúr Pétursson [this message]
2015-09-30 15:50 ` [PATCH] btrfs: add " David Sterba
2015-09-28 22:33 ` [PATCH] btrfs-progs: " Gabríel Arthúr Pétursson
2015-09-29 12:00 ` Add " David Sterba
2015-09-29 12:10 ` Austin S Hemmelgarn
2015-09-29 12:21 ` Hugo Mills
2015-09-30 15:28 ` David Sterba
2015-09-30 15:16 ` David Sterba
2015-10-12 14:10 ` David Sterba
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=1443479561-785-1-git-send-email-gabriel@system.is \
--to=gabriel@system.is \
--cc=linux-btrfs@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).