From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH 2/2] btrfs-progs: define BTRFS_MKFS_SMALL_VOLUME_SIZE for small volume
Date: Tue, 15 Jul 2014 16:02:10 +0800 [thread overview]
Message-ID: <1405411330-8557-2-git-send-email-anand.jain@oracle.com> (raw)
In-Reply-To: <1405411330-8557-1-git-send-email-anand.jain@oracle.com>
mkfs cut of size '1024 * 1024 * 1024' to mark dev as small volume so to
force mixed group. Use a define for that.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
mkfs.c | 2 +-
utils.c | 4 ++--
utils.h | 1 +
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/mkfs.c b/mkfs.c
index cba4f02..d980d4a 100644
--- a/mkfs.c
+++ b/mkfs.c
@@ -1335,7 +1335,7 @@ int main(int ac, char **av)
break;
case 'b':
block_count = parse_size(optarg);
- if (block_count <= 1024*1024*1024) {
+ if (block_count <= BTRFS_MKFS_SMALL_VOLUME_SIZE) {
fprintf(stdout,
"SMALL VOLUME: forcing mixed metadata/data groups\n");
mixed = 1;
diff --git a/utils.c b/utils.c
index 159f2a2..673134e 100644
--- a/utils.c
+++ b/utils.c
@@ -705,7 +705,7 @@ int btrfs_prepare_device(int fd, char *file, int zero_end, u64 *block_count_ret,
if (max_block_count)
block_count = min(block_count, max_block_count);
- if (block_count < 1024 * 1024 * 1024 && !(*mixed)) {
+ if (block_count < BTRFS_MKFS_SMALL_VOLUME_SIZE && !(*mixed)) {
printf("SMALL VOLUME: forcing mixed metadata/data groups\n");
*mixed = 1;
}
@@ -2351,7 +2351,7 @@ int is_vol_small(char *file)
close(fd);
return -1;
}
- if (size < 1024 * 1024 * 1024) {
+ if (size < BTRFS_MKFS_SMALL_VOLUME_SIZE) {
close(fd);
return 1;
} else {
diff --git a/utils.h b/utils.h
index 5bc22ec..ddf31cf 100644
--- a/utils.h
+++ b/utils.h
@@ -24,6 +24,7 @@
#include <dirent.h>
#define BTRFS_MKFS_SYSTEM_GROUP_SIZE (4 * 1024 * 1024)
+#define BTRFS_MKFS_SMALL_VOLUME_SIZE (1024 * 1024 * 1024)
#define BTRFS_SCAN_PROC (1ULL << 0)
#define BTRFS_SCAN_DEV (1ULL << 1)
--
2.0.0.153.g79dcccc
prev parent reply other threads:[~2014-07-15 7:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-15 8:02 [PATCH 1/2] btrfs-progs: dont break the string Anand Jain
2014-07-15 8:02 ` Anand Jain [this message]
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=1405411330-8557-2-git-send-email-anand.jain@oracle.com \
--to=anand.jain@oracle.com \
--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).