projects
/
platform
/
upstream
/
btrfs-progs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
btrfs-progs: lowmem check: Output more detailed information about file extent interrupt
[platform/upstream/btrfs-progs.git]
/
cmds-device.c
diff --git
a/cmds-device.c
b/cmds-device.c
index
58f7dee
..
f4cdb39
100644
(file)
--- a/
cmds-device.c
+++ b/
cmds-device.c
@@
-33,6
+33,7
@@
#include "commands.h"
#include "help.h"
#include "commands.h"
#include "help.h"
+#include "mkfs/common.h"
static const char * const device_cmd_group_usage[] = {
"btrfs device <command> [<args>]",
static const char * const device_cmd_group_usage[] = {
"btrfs device <command> [<args>]",
@@
-223,9
+224,16
@@
static int _cmd_device_remove(int argc, char **argv,
return !!ret;
}
return !!ret;
}
+#define COMMON_USAGE_REMOVE_DELETE \
+ "If 'missing' is specified for <device>, the first device that is", \
+ "described by the filesystem metadata, but not present at the mount", \
+ "time will be removed. (only in degraded mode)"
+
static const char * const cmd_device_remove_usage[] = {
"btrfs device remove <device>|<devid> [<device>|<devid>...] <path>",
"Remove a device from a filesystem",
static const char * const cmd_device_remove_usage[] = {
"btrfs device remove <device>|<devid> [<device>|<devid>...] <path>",
"Remove a device from a filesystem",
+ "",
+ COMMON_USAGE_REMOVE_DELETE,
NULL
};
NULL
};
@@
-236,7
+244,9
@@
static int cmd_device_remove(int argc, char **argv)
static const char * const cmd_device_delete_usage[] = {
"btrfs device delete <device>|<devid> [<device>|<devid>...] <path>",
static const char * const cmd_device_delete_usage[] = {
"btrfs device delete <device>|<devid> [<device>|<devid>...] <path>",
- "Remove a device from a filesystem",
+ "Remove a device from a filesystem (alias of \"btrfs device remove\")",
+ "",
+ COMMON_USAGE_REMOVE_DELETE,
NULL
};
NULL
};
@@
-399,6
+409,7
@@
static int cmd_device_stats(int argc, char **argv)
while (1) {
int c;
static const struct option long_options[] = {
while (1) {
int c;
static const struct option long_options[] = {
+ {"check", no_argument, NULL, 'c'},
{"reset", no_argument, NULL, 'z'},
{NULL, 0, NULL, 0}
};
{"reset", no_argument, NULL, 'z'},
{NULL, 0, NULL, 0}
};
@@
-534,8
+545,8
@@
static int _cmd_device_usage(int fd, char *path, unsigned unit_mode)
for (i = 0; i < devcount; i++) {
printf("%s, ID: %llu\n", devinfo[i].path, devinfo[i].devid);
for (i = 0; i < devcount; i++) {
printf("%s, ID: %llu\n", devinfo[i].path, devinfo[i].devid);
- print_device_sizes(
fd,
&devinfo[i], unit_mode);
- print_device_chunks(
fd,
&devinfo[i], chunkinfo, chunkcount,
+ print_device_sizes(&devinfo[i], unit_mode);
+ print_device_chunks(&devinfo[i], chunkinfo, chunkcount,
unit_mode);
printf("\n");
}
unit_mode);
printf("\n");
}