b3ba9dc0aa
- adjust fs size to correct size (bnc#744593) - man page documentation updates - do not package obsolete utilities - mkfs: store correct size of device in superblock (bnc#730103) - updated restriper/balance commands to match kernel version - device scanning fixes for dm and multipath (bnc#749540) OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=121
153 lines
5.2 KiB
Diff
153 lines
5.2 KiB
Diff
From 251cef9c8992b79d9d80515387cb0c26ab3b154d Mon Sep 17 00:00:00 2001
|
|
From: David Sterba <dsterba@suse.cz>
|
|
Date: Tue, 31 Jan 2012 15:32:28 +0100
|
|
Subject: [PATCH] btrfs-progs: mkfs: allow not to trim a device
|
|
|
|
Signed-off-by: David Sterba <dsterba@suse.cz>
|
|
---
|
|
man/mkfs.btrfs.8.in | 4 ++++
|
|
mkfs.c | 15 +++++++++++----
|
|
utils.c | 18 +++++++++++++-----
|
|
utils.h | 2 ++
|
|
4 files changed, 30 insertions(+), 9 deletions(-)
|
|
|
|
Index: btrfs-progs-v0.19-118-gfdb6c04/man/mkfs.btrfs.8.in
|
|
===================================================================
|
|
--- btrfs-progs-v0.19-118-gfdb6c04.orig/man/mkfs.btrfs.8.in
|
|
+++ btrfs-progs-v0.19-118-gfdb6c04/man/mkfs.btrfs.8.in
|
|
@@ -13,6 +13,7 @@ mkfs.btrfs \- create an btrfs filesystem
|
|
[ \fB \-M\fP\fI mixed data+metadata\fP ]
|
|
[ \fB \-n\fP\fI nodesize\fP ]
|
|
[ \fB \-s\fP\fI sectorsize\fP ]
|
|
+[ \fB \-T\fP ]
|
|
[ \fB \-h\fP ]
|
|
[ \fB \-V\fP ] \fI device\fP [ \fI device ...\fP ]
|
|
.SH DESCRIPTION
|
|
@@ -62,6 +63,9 @@ Specify the nodesize. By default the val
|
|
\fB\-s\fR, \fB\-\-sectorsize \fIsize\fR
|
|
Specify the sectorsize, the minimum block allocation.
|
|
.TP
|
|
+\fB\-T\fR, \fB\-\-nodiscard \fR
|
|
+Do not perform whole device TRIM operation by default.
|
|
+.TP
|
|
\fB\-V\fR, \fB\-\-version\fR
|
|
Print the \fBmkfs.btrfs\fP version and exit.
|
|
.SH AVAILABILITY
|
|
Index: btrfs-progs-v0.19-118-gfdb6c04/mkfs.c
|
|
===================================================================
|
|
--- btrfs-progs-v0.19-118-gfdb6c04.orig/mkfs.c
|
|
+++ btrfs-progs-v0.19-118-gfdb6c04/mkfs.c
|
|
@@ -311,6 +311,7 @@ static void print_usage(void)
|
|
fprintf(stderr, "\t -n --nodesize size of btree nodes\n");
|
|
fprintf(stderr, "\t -s --sectorsize min block allocation\n");
|
|
fprintf(stderr, "\t -r --rootdir the source directory\n");
|
|
+ fprintf(stderr, "\t -T --nodiscard do not perform whole device TRIM\n");
|
|
fprintf(stderr, "%s\n", BTRFS_BUILD_VERSION);
|
|
exit(1);
|
|
}
|
|
@@ -370,6 +371,7 @@ static struct option long_options[] = {
|
|
{ "version", 0, NULL, 'V' },
|
|
{ "rootdir", 1, NULL, 'r' },
|
|
{ "force", 0, NULL, 'f' },
|
|
+ { "nodiscard", 0, NULL, 'T' },
|
|
{ 0, 0, 0, 0}
|
|
};
|
|
|
|
@@ -1186,6 +1188,7 @@ int main(int ac, char **av)
|
|
int mixed = 0;
|
|
int data_profile_opt = 0;
|
|
int metadata_profile_opt = 0;
|
|
+ int nodiscard = 0;
|
|
|
|
char *source_dir = NULL;
|
|
int source_dir_set = 0;
|
|
@@ -1197,7 +1200,7 @@ int main(int ac, char **av)
|
|
|
|
while(1) {
|
|
int c;
|
|
- c = getopt_long(ac, av, "A:b:l:n:s:m:d:L:r:VMf", long_options,
|
|
+ c = getopt_long(ac, av, "A:b:l:n:s:m:d:L:r:VMfT", long_options,
|
|
&option_index);
|
|
if (c < 0)
|
|
break;
|
|
@@ -1246,6 +1249,9 @@ int main(int ac, char **av)
|
|
case 'f':
|
|
force=1;
|
|
break;
|
|
+ case 'T':
|
|
+ nodiscard=1;
|
|
+ break;
|
|
default:
|
|
print_usage();
|
|
}
|
|
@@ -1287,7 +1293,8 @@ int main(int ac, char **av)
|
|
exit(1);
|
|
}
|
|
first_file = file;
|
|
- ret = btrfs_prepare_device(fd, file, zero_end, &dev_block_count, &mixed);
|
|
+ ret = __btrfs_prepare_device(fd, file, zero_end,
|
|
+ &dev_block_count, &mixed, nodiscard);
|
|
if (block_count == 0)
|
|
block_count = dev_block_count;
|
|
else if (block_count > dev_block_count) {
|
|
@@ -1392,8 +1399,8 @@ int main(int ac, char **av)
|
|
close(fd);
|
|
continue;
|
|
}
|
|
- ret = btrfs_prepare_device(fd, file, zero_end,
|
|
- &dev_block_count, &mixed);
|
|
+ ret = __btrfs_prepare_device(fd, file, zero_end,
|
|
+ &dev_block_count, &mixed, nodiscard);
|
|
mixed = old_mixed;
|
|
BUG_ON(ret);
|
|
|
|
Index: btrfs-progs-v0.19-118-gfdb6c04/utils.c
|
|
===================================================================
|
|
--- btrfs-progs-v0.19-118-gfdb6c04.orig/utils.c
|
|
+++ btrfs-progs-v0.19-118-gfdb6c04/utils.c
|
|
@@ -539,6 +539,12 @@ int btrfs_add_to_fsid(struct btrfs_trans
|
|
int btrfs_prepare_device(int fd, char *file, int zero_end, u64 *block_count_ret,
|
|
int *mixed)
|
|
{
|
|
+ /* discard by default when called from 'device add' */
|
|
+ return __btrfs_prepare_device(fd, file, zero_end, block_count_ret, mixed, 0);
|
|
+}
|
|
+int __btrfs_prepare_device(int fd, char *file, int zero_end, u64 *block_count_ret,
|
|
+ int *mixed, int nodiscard)
|
|
+{
|
|
u64 block_count;
|
|
u64 bytenr;
|
|
struct stat st;
|
|
@@ -562,11 +568,13 @@ int btrfs_prepare_device(int fd, char *f
|
|
*mixed = 1;
|
|
}
|
|
|
|
- /*
|
|
- * We intentionally ignore errors from the discard ioctl. It is
|
|
- * not necessary for the mkfs functionality but just an optimization.
|
|
- */
|
|
- discard_blocks(fd, 0, block_count);
|
|
+ if (!nodiscard) {
|
|
+ /*
|
|
+ * We intentionally ignore errors from the discard ioctl. It is
|
|
+ * not necessary for the mkfs functionality but just an optimization.
|
|
+ */
|
|
+ discard_blocks(fd, 0, block_count);
|
|
+ }
|
|
|
|
ret = zero_dev_start(fd);
|
|
if (ret) {
|
|
Index: btrfs-progs-v0.19-118-gfdb6c04/utils.h
|
|
===================================================================
|
|
--- btrfs-progs-v0.19-118-gfdb6c04.orig/utils.h
|
|
+++ btrfs-progs-v0.19-118-gfdb6c04/utils.h
|
|
@@ -28,6 +28,8 @@ int btrfs_make_root_dir(struct btrfs_tra
|
|
struct btrfs_root *root, u64 objectid);
|
|
int btrfs_prepare_device(int fd, char *file, int zero_end,
|
|
u64 *block_count_ret, int *mixed);
|
|
+int __btrfs_prepare_device(int fd, char *file, int zero_end,
|
|
+ u64 *block_count_ret, int *mixed, int nodiscard);
|
|
int btrfs_add_to_fsid(struct btrfs_trans_handle *trans,
|
|
struct btrfs_root *root, int fd, char *path,
|
|
u64 block_count, u32 io_width, u32 io_align,
|