* Boston, MA 021110-1307, USA.
*/
-#define _XOPEN_SOURCE 500
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "ioctl.h"
#include "utils.h"
#include "volumes.h"
-#include "version.h"
#include "commands.h"
-#include "cmds-fi-disk_usage.h"
+#include "cmds-fi-usage.h"
#include "list_sort.h"
#include "disk-io.h"
unsigned unit_mode = UNITS_DEFAULT;
while (1) {
- int long_index;
+ int c;
static const struct option long_options[] = {
{ "raw", no_argument, NULL, 'b'},
{ "kbytes", no_argument, NULL, 'k'},
{ "iec", no_argument, NULL, GETOPT_VAL_IEC},
{ "human-readable", no_argument, NULL,
GETOPT_VAL_HUMAN_READABLE},
+ { NULL, 0, NULL, 0 }
};
- int c = getopt_long(argc, argv, "bhHkmgt", long_options,
- &long_index);
+
+ c = getopt_long(argc, argv, "bhHkmgt", long_options, NULL);
if (c < 0)
break;
switch (c) {
}
static void print_devices(struct btrfs_fs_devices *fs_devices,
- u64 *devs_found)
+ u64 *devs_found, unsigned unit_mode)
{
struct btrfs_device *device;
struct btrfs_fs_devices *cur_fs;
list_for_each_entry(device, all_devices, dev_list) {
printf("\tdevid %4llu size %s used %s path %s\n",
(unsigned long long)device->devid,
- pretty_size(device->total_bytes),
- pretty_size(device->bytes_used), device->name);
+ pretty_size_mode(device->total_bytes, unit_mode),
+ pretty_size_mode(device->bytes_used, unit_mode),
+ device->name);
(*devs_found)++;
}
}
-static void print_one_uuid(struct btrfs_fs_devices *fs_devices)
+static void print_one_uuid(struct btrfs_fs_devices *fs_devices,
+ unsigned unit_mode)
{
char uuidbuf[BTRFS_UUID_UNPARSED_SIZE];
struct btrfs_device *device;
total = device->total_devs;
printf(" uuid: %s\n\tTotal devices %llu FS bytes used %s\n", uuidbuf,
(unsigned long long)total,
- pretty_size(device->super_bytes_used));
+ pretty_size_mode(device->super_bytes_used, unit_mode));
- print_devices(fs_devices, &devs_found);
+ print_devices(fs_devices, &devs_found, unit_mode);
if (devs_found < total) {
printf("\t*** Some devices missing\n");
static int print_one_fs(struct btrfs_ioctl_fs_info_args *fs_info,
struct btrfs_ioctl_dev_info_args *dev_info,
struct btrfs_ioctl_space_args *space_info,
- char *label, char *path)
+ char *label, char *path, unsigned unit_mode)
{
int i;
int fd;
printf(" uuid: %s\n\tTotal devices %llu FS bytes used %s\n", uuidbuf,
fs_info->num_devices,
- pretty_size(calc_used_bytes(space_info)));
+ pretty_size_mode(calc_used_bytes(space_info),
+ unit_mode));
for (i = 0; i < fs_info->num_devices; i++) {
char *canonical_path;
canonical_path = canonicalize_path((char *)tmp_dev_info->path);
printf("\tdevid %4llu size %s used %s path %s\n",
tmp_dev_info->devid,
- pretty_size(tmp_dev_info->total_bytes),
- pretty_size(tmp_dev_info->bytes_used),
+ pretty_size_mode(tmp_dev_info->total_bytes, unit_mode),
+ pretty_size_mode(tmp_dev_info->bytes_used, unit_mode),
canonical_path);
free(canonical_path);
return 0;
}
-static int btrfs_scan_kernel(void *search)
+static int btrfs_scan_kernel(void *search, unsigned unit_mode)
{
int ret = 0, fd;
int found = 0;
fd = open(mnt->mnt_dir, O_RDONLY);
if ((fd != -1) && !get_df(fd, &space_info_arg)) {
print_one_fs(&fs_info_arg, dev_info_arg,
- space_info_arg, label, mnt->mnt_dir);
+ space_info_arg, label, mnt->mnt_dir,
+ unit_mode);
kfree(space_info_arg);
memset(label, 0, sizeof(label));
found = 1;
"Show the structure of a filesystem",
"-d|--all-devices show only disks under /dev containing btrfs filesystem",
"-m|--mounted show only mounted btrfs",
+ "--raw raw numbers in bytes",
+ "--human-readable human friendly numbers, base 1024 (default)",
+ "--iec use 1024 as a base (KiB, MiB, GiB, TiB)",
+ "--si use 1000 as a base (kB, MB, GB, TB)",
+ "--kbytes show sizes in KiB, or kB with --si",
+ "--mbytes show sizes in MiB, or MB with --si",
+ "--gbytes show sizes in GiB, or GB with --si",
+ "--tbytes show sizes in TiB, or TB with --si",
"If no argument is given, structure of all present filesystems is shown.",
NULL
};
/* default, search both kernel and udev */
int where = -1;
int type = 0;
- char mp[BTRFS_PATH_NAME_MAX + 1];
+ char mp[PATH_MAX];
char path[PATH_MAX];
__u8 fsid[BTRFS_FSID_SIZE];
char uuid_buf[BTRFS_UUID_UNPARSED_SIZE];
+ unsigned unit_mode = UNITS_DEFAULT;
int found = 0;
while (1) {
- int long_index;
+ int c;
static const struct option long_options[] = {
{ "all-devices", no_argument, NULL, 'd'},
{ "mounted", no_argument, NULL, 'm'},
- { NULL, no_argument, NULL, 0 },
+ { "raw", no_argument, NULL, GETOPT_VAL_RAW},
+ { "kbytes", no_argument, NULL, GETOPT_VAL_KBYTES},
+ { "mbytes", no_argument, NULL, GETOPT_VAL_MBYTES},
+ { "gbytes", no_argument, NULL, GETOPT_VAL_GBYTES},
+ { "tbytes", no_argument, NULL, GETOPT_VAL_TBYTES},
+ { "si", no_argument, NULL, GETOPT_VAL_SI},
+ { "iec", no_argument, NULL, GETOPT_VAL_IEC},
+ { "human-readable", no_argument, NULL,
+ GETOPT_VAL_HUMAN_READABLE},
+ { NULL, 0, NULL, 0 }
};
- int c = getopt_long(argc, argv, "dm", long_options,
- &long_index);
+
+ c = getopt_long(argc, argv, "dm", long_options, NULL);
if (c < 0)
break;
switch (c) {
case 'm':
where = BTRFS_SCAN_MOUNTED;
break;
+ case GETOPT_VAL_RAW:
+ units_set_mode(&unit_mode, UNITS_RAW);
+ break;
+ case GETOPT_VAL_KBYTES:
+ units_set_base(&unit_mode, UNITS_KBYTES);
+ break;
+ case GETOPT_VAL_MBYTES:
+ units_set_base(&unit_mode, UNITS_MBYTES);
+ break;
+ case GETOPT_VAL_GBYTES:
+ units_set_base(&unit_mode, UNITS_GBYTES);
+ break;
+ case GETOPT_VAL_TBYTES:
+ units_set_base(&unit_mode, UNITS_TBYTES);
+ break;
+ case GETOPT_VAL_SI:
+ units_set_mode(&unit_mode, UNITS_DECIMAL);
+ break;
+ case GETOPT_VAL_IEC:
+ units_set_mode(&unit_mode, UNITS_BINARY);
+ break;
+ case GETOPT_VAL_HUMAN_READABLE:
+ units_set_mode(&unit_mode, UNITS_HUMAN_BINARY);
+ break;
default:
usage(cmd_show_usage);
}
goto devs_only;
/* show mounted btrfs */
- ret = btrfs_scan_kernel(search);
+ ret = btrfs_scan_kernel(search, unit_mode);
if (search && !ret) {
/* since search is found we are done */
goto out;
}
list_for_each_entry(fs_devices, &all_uuids, list)
- print_one_uuid(fs_devices);
+ print_one_uuid(fs_devices, unit_mode);
if (search && !found)
ret = 1;
free_fs_devices(fs_devices);
}
out:
- printf("%s\n", BTRFS_BUILD_VERSION);
+ printf("%s\n", PACKAGE_STRING);
free_seen_fsid();
return ret;
}
"-f flush data to disk immediately after defragmenting",
"-s start defragment only from byte onward",
"-l len defragment only up to len bytes",
- "-t size minimal size of file to be considered for defragmenting",
+ "-t size target extent size hint",
NULL
};
int flush = 0;
u64 start = 0;
u64 len = (u64)-1;
- u32 thresh = 0;
+ u64 thresh = 0;
int i;
int recursive = 0;
int ret = 0;
break;
case 't':
thresh = parse_size(optarg);
+ if (thresh > (u32)-1) {
+ fprintf(stderr,
+ "WARNING: target extent size %llu too big, trimmed to %u",
+ thresh, (u32)-1);
+ }
defrag_global_fancy_ioctl = 1;
break;
case 'r':
memset(&defrag_global_range, 0, sizeof(range));
defrag_global_range.start = start;
defrag_global_range.len = len;
- defrag_global_range.extent_thresh = thresh;
+ defrag_global_range.extent_thresh = (u32)thresh;
if (compress_type) {
defrag_global_range.flags |= BTRFS_DEFRAG_RANGE_COMPRESS;
defrag_global_range.compress_type = compress_type;
}
}
if (defrag_global_verbose)
- printf("%s\n", BTRFS_BUILD_VERSION);
+ printf("%s\n", PACKAGE_STRING);
if (defrag_global_errors)
fprintf(stderr, "total %d failures\n", defrag_global_errors);
int fd, res, len, e;
char *amount, *path;
DIR *dirstream = NULL;
+ struct stat st;
if (check_argc_exact(argc, 3))
usage(cmd_resize_usage);
return 1;
}
+ res = stat(path, &st);
+ if (res < 0) {
+ fprintf(stderr, "ERROR: resize: cannot stat %s: %s\n",
+ path, strerror(errno));
+ return 1;
+ }
+ if (!S_ISDIR(st.st_mode)) {
+ fprintf(stderr,
+ "ERROR: resize works on mounted filesystems and accepts only\n"
+ "directories as argument. Passing file containing a btrfs image\n"
+ "would resize the underlying filesystem instead of the image.\n");
+ return 1;
+ }
+
fd = open_file_or_dir(path, &dirstream);
if (fd < 0) {
fprintf(stderr, "ERROR: can't access '%s'\n", path);
}
printf("Resize '%s' of '%s'\n", path, amount);
+ memset(&args, 0, sizeof(args));
strncpy_null(args.name, amount);
res = ioctl(fd, BTRFS_IOC_RESIZE, &args);
e = errno;
fprintf(stderr, "ERROR: unable to resize '%s' - %s\n",
path, strerror(e));
return 1;
+ } else if (res > 0) {
+ const char *err_str = btrfs_err_str(res);
+
+ if (err_str) {
+ fprintf(stderr, "ERROR: btrfs error resizing '%s' - %s\n",
+ path, err_str);
+ } else {
+ fprintf(stderr,
+ "ERROR: btrfs error resizing '%s' - unknown btrfs_err_code %d\n",
+ path, res);
+ }
+ return 1;
}
return 0;
}
}
}
+static const char filesystem_cmd_group_info[] =
+"overall filesystem tasks and information";
+
const struct cmd_group filesystem_cmd_group = {
- filesystem_cmd_group_usage, NULL, {
+ filesystem_cmd_group_usage, filesystem_cmd_group_info, {
{ "df", cmd_filesystem_df, cmd_filesystem_df_usage, NULL, 0 },
{ "show", cmd_show, cmd_show_usage, NULL, 0 },
{ "sync", cmd_sync, cmd_sync_usage, NULL, 0 },
{ "defragment", cmd_defrag, cmd_defrag_usage, NULL, 0 },
- { "balance", cmd_balance, NULL, &balance_cmd_group, 1 },
+ { "balance", cmd_balance, NULL, &balance_cmd_group, CMD_HIDDEN },
{ "resize", cmd_resize, cmd_resize_usage, NULL, 0 },
{ "label", cmd_label, cmd_label_usage, NULL, 0 },
{ "usage", cmd_filesystem_usage,
projects / platform / upstream / btrfs-progs.git / blobdiff