aboutsummaryrefslogtreecommitdiffstats
path: root/testing/ocfs2-tools/tunefs-remove-op_query.patch
blob: f3b35e7d2194ed53244112ee54fed391f9a1aa4e (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Wed, 23 May 2018 21:14:00 +0200
Subject: [PATCH] Remove query operation from tunefs

tunefs.ocfs2/op_query.c uses glibc's printf extensions that are not
available in the musl libc. I didn't find any standalone implementation
and it's not trivial to implement them, so we must remove this feature
for now.

--- a/tunefs.ocfs2/Makefile
+++ b/tunefs.ocfs2/Makefile
@@ -42,7 +42,6 @@
 	op_cloned_volume		\
 	op_features			\
 	op_list_sparse_files		\
-	op_query			\
 	op_reset_uuid			\
 	op_resize_volume		\
 	op_set_label			\
--- a/tunefs.ocfs2/ocfs2ne.c
+++ b/tunefs.ocfs2/ocfs2ne.c
@@ -89,7 +89,6 @@
 
 
 extern struct tunefs_operation list_sparse_op;
-extern struct tunefs_operation query_op;
 extern struct tunefs_operation reset_uuid_op;
 extern struct tunefs_operation features_op;
 extern struct tunefs_operation resize_volume_op;
@@ -498,17 +497,6 @@
 	.opt_handle	= handle_answer,
 };
 
-static struct tunefs_option query_option = {
-	.opt_option	= {
-		.name		= "query",
-		.val		= 'Q',
-		.has_arg	= 1,
-	},
-	.opt_help	= "-Q|--query <query-format>",
-	.opt_handle	= &generic_handle_arg,
-	.opt_op		= &query_op,
-};
-
 static struct tunefs_option list_sparse_option = {
 	.opt_option	= {
 		.name	= "list-sparse",
@@ -652,7 +640,6 @@
 	&resize_volume_option,
 	&reset_uuid_option,
 	&journal_option,
-	&query_option,
 	&list_sparse_option,
 	&mount_type_option,
 	&backup_super_option,