45 lines
1.2 KiB
Diff
45 lines
1.2 KiB
Diff
|
From e7cd3d7fa55bb26d9b4579fececc863db6555d97 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Li Yang <liyang.fnst@cn.fujitsu.com>
|
||
|
|
Date: Mon, 21 Apr 2014 05:38:08 -0400
|
||
|
|
Subject: [PATCH 09/42] Btrfs-progs: mkfs: Remove 'zero_end =1' since it has
|
||
|
|
been set to a value
|
||
|
|
|
||
|
|
In utils.c, zero_end is used as a parameter, should not force it to 1.
|
||
|
|
In mkfs.c, zero_end is set to 1 or 0(-b) at the beginning, should not
|
||
|
|
force it to 1 unconditionally.
|
||
|
|
|
||
|
|
Signed-off-by: Li Yang <liyang.fnst@cn.fujitsu.com>
|
||
|
|
Signed-off-by: David Sterba <dsterba@suse.cz>
|
||
|
|
---
|
||
|
|
mkfs.c | 1 -
|
||
|
|
utils.c | 1 -
|
||
|
|
2 files changed, 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/mkfs.c b/mkfs.c
|
||
|
|
index dbd83f5ce168..f2b577922c9e 100644
|
||
|
|
--- a/mkfs.c
|
||
|
|
+++ b/mkfs.c
|
||
|
|
@@ -1543,7 +1543,6 @@ int main(int ac, char **av)
|
||
|
|
|
||
|
|
btrfs_register_one_device(file);
|
||
|
|
|
||
|
|
- zero_end = 1;
|
||
|
|
while (dev_cnt-- > 0) {
|
||
|
|
int old_mixed = mixed;
|
||
|
|
|
||
|
|
diff --git a/utils.c b/utils.c
|
||
|
|
index 44c0e4ab39f2..29953d9dd2a9 100644
|
||
|
|
--- a/utils.c
|
||
|
|
+++ b/utils.c
|
||
|
|
@@ -613,7 +613,6 @@ 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);
|
||
|
|
- zero_end = 1;
|
||
|
|
|
||
|
|
if (block_count < 1024 * 1024 * 1024 && !(*mixed)) {
|
||
|
|
printf("SMALL VOLUME: forcing mixed metadata/data groups\n");
|
||
|
|
--
|
||
|
|
1.9.0
|
||
|
|
|