2c5c7c6753
- rebuild extent records - fix block group accounting - reset csums for rescue nodatasum mount - prune corrupt extent allocation tree blocks - device scanning fixes for dm and multipath - initrd support: move btrfs device scan after block device setup - documentation updates - add csize for file commpressed size - updated restore utility OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=118
182 lines
5.4 KiB
Diff
182 lines
5.4 KiB
Diff
From 72218a2090e1cbafe9baa97aaa465a28438c3dbb Mon Sep 17 00:00:00 2001
|
|
From: David Sterba <dsterba@suse.cz>
|
|
Date: Mon, 19 Dec 2011 17:51:11 +0100
|
|
Subject: [PATCH 16/43] btrfs-progs: Add ioctl to read compressed size of a
|
|
file
|
|
|
|
Signed-off-by: David Sterba <dsterba@suse.cz>
|
|
---
|
|
btrfs.c | 9 ++++++-
|
|
btrfs_cmds.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
btrfs_cmds.h | 1 +
|
|
ioctl.h | 13 ++++++++++
|
|
man/btrfs.8.in.old | 10 +++++++
|
|
5 files changed, 100 insertions(+), 1 deletions(-)
|
|
|
|
diff --git a/btrfs.c b/btrfs.c
|
|
index e78f194..f5b8fd4 100644
|
|
--- a/btrfs.c
|
|
+++ b/btrfs.c
|
|
@@ -325,7 +325,14 @@ static struct Command commands[] = {
|
|
"filesystem label", "<device> [<newlabel>]\n"
|
|
"With one argument, get the label of filesystem on <device>.\n"
|
|
"If <newlabel> is passed, set the filesystem label to <newlabel>.\n"
|
|
- "The filesystem must be unmounted.\n"
|
|
+ "The filesystem must be unmounted."
|
|
+ },
|
|
+ { do_compr_size, -1,
|
|
+ "filesystem csize", "[-s start] [-e end] <file>\n"
|
|
+ "Read ordinary and compressed size of extents in the range [start,end)\n"
|
|
+ "-s start range start inclusive, accepts K/M/G modifiers\n"
|
|
+ "-e end range end exclusive, accepts K/M/G modifiers\n",
|
|
+ NULL
|
|
},
|
|
{ do_scrub_start, -1,
|
|
"scrub start", "[-Bdqr] <path>|<device>\n"
|
|
diff --git a/btrfs_cmds.c b/btrfs_cmds.c
|
|
index 12346e5..c8196d1 100644
|
|
--- a/btrfs_cmds.c
|
|
+++ b/btrfs_cmds.c
|
|
@@ -2058,3 +2058,71 @@ out:
|
|
free(inodes);
|
|
return ret;
|
|
}
|
|
+
|
|
+int do_compr_size(int argc, char **argv)
|
|
+{
|
|
+ int ret;
|
|
+ int fd;
|
|
+ struct btrfs_ioctl_compr_size_args args;
|
|
+
|
|
+ args.start = 0;
|
|
+ args.end = (u64)-1;
|
|
+ optind = 1;
|
|
+ while (1) {
|
|
+ int c = getopt(argc, argv, "s:e:r");
|
|
+ if (c < 0)
|
|
+ break;
|
|
+ switch (c) {
|
|
+ case 's':
|
|
+ args.start = parse_size(optarg);
|
|
+ break;
|
|
+ case 'e':
|
|
+ args.end = parse_size(optarg);
|
|
+ break;
|
|
+ default:
|
|
+ fprintf(stderr, "ERROR: Invalid arguments for csize\n");
|
|
+ return 1;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ if (args.start > args.end) {
|
|
+ fprintf(stderr, "ERROR: Invalid range for csize\n");
|
|
+ return 1;
|
|
+ }
|
|
+
|
|
+ if (argc - optind == 0) {
|
|
+ fprintf(stderr, "ERROR: Invalid arguments for csize\n");
|
|
+ return 1;
|
|
+ }
|
|
+ argc -= optind;
|
|
+
|
|
+ fd = open_file_or_dir(argv[optind]);
|
|
+ if (fd < 0) {
|
|
+ fprintf(stderr, "ERROR: can't access '%s'\n", argv[optind]);
|
|
+ return 1;
|
|
+ }
|
|
+
|
|
+ ret = ioctl(fd, BTRFS_IOC_COMPR_SIZE, &args);
|
|
+ if (ret < 0) {
|
|
+ fprintf(stderr, "ERROR: ioctl returned %d, errno %d %s\n",
|
|
+ ret, errno, strerror(errno));
|
|
+ return errno;
|
|
+ }
|
|
+
|
|
+ printf("File name: %s\n", argv[optind]);
|
|
+ if (args.end == (u64)-1)
|
|
+ printf("File range: %llu-EOF\n",
|
|
+ (unsigned long long)args.start);
|
|
+ else
|
|
+ printf("File range: %llu-%llu\n",
|
|
+ (unsigned long long)args.start,
|
|
+ (unsigned long long)args.end);
|
|
+
|
|
+ printf("Compressed size: %llu\n",
|
|
+ (unsigned long long)(args.compressed_size << 9));
|
|
+ printf("Uncompressed size: %llu\n",
|
|
+ (unsigned long long)(args.size << 9));
|
|
+ printf("Ratio: %3.2f%%\n",
|
|
+ 100.0 * args.compressed_size / args.size);
|
|
+ return 0;
|
|
+}
|
|
diff --git a/btrfs_cmds.h b/btrfs_cmds.h
|
|
index 53d51d6..07dad7a 100644
|
|
--- a/btrfs_cmds.h
|
|
+++ b/btrfs_cmds.h
|
|
@@ -46,3 +46,4 @@ int open_file_or_dir(const char *fname);
|
|
int do_ino_to_path(int nargs, char **argv);
|
|
int do_logical_to_ino(int nargs, char **argv);
|
|
char *path_for_root(int fd, u64 root);
|
|
+int do_compr_size(int argc, char **argv);
|
|
diff --git a/ioctl.h b/ioctl.h
|
|
index 78aebce..a820098 100644
|
|
--- a/ioctl.h
|
|
+++ b/ioctl.h
|
|
@@ -272,6 +272,17 @@ struct btrfs_ioctl_logical_ino_args {
|
|
__u64 inodes;
|
|
};
|
|
|
|
+struct btrfs_ioctl_compr_size_args {
|
|
+ /* Range start, inclusive */
|
|
+ __u64 start; /* in */
|
|
+ /* Range end, exclusive */
|
|
+ __u64 end; /* in */
|
|
+ __u64 size; /* out */
|
|
+ __u64 compressed_size; /* out */
|
|
+ __u64 reserved[2];
|
|
+};
|
|
+
|
|
+
|
|
/* BTRFS_IOC_SNAP_CREATE is no longer used by the btrfs command */
|
|
#define BTRFS_IOC_SNAP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 1, \
|
|
struct btrfs_ioctl_vol_args)
|
|
@@ -330,5 +341,7 @@ struct btrfs_ioctl_logical_ino_args {
|
|
struct btrfs_ioctl_ino_path_args)
|
|
#define BTRFS_IOC_LOGICAL_INO _IOWR(BTRFS_IOCTL_MAGIC, 36, \
|
|
struct btrfs_ioctl_ino_path_args)
|
|
+#define BTRFS_IOC_COMPR_SIZE _IOR(BTRFS_IOCTL_MAGIC, 51, \
|
|
+ struct btrfs_ioctl_compr_size_args)
|
|
|
|
#endif
|
|
diff --git a/man/btrfs.8.in.old b/man/btrfs.8.in.old
|
|
index be478e0..b7dacea 100644
|
|
--- a/man/btrfs.8.in.old
|
|
+++ b/man/btrfs.8.in.old
|
|
@@ -31,6 +31,8 @@ btrfs \- control a btrfs filesystem
|
|
.PP
|
|
\fBbtrfs\fP \fBfilesystem defragment\fP\fI <file>|<dir> [<file>|<dir>...]\fP
|
|
.PP
|
|
+\fBbtrfs\fP \fBfilesystem csize \fP\fI [-s start] [-e end] <file> \fP
|
|
+.PP
|
|
\fBbtrfs\fP \fBdevice scan\fP\fI [--all-devices|<device> [<device>...]]\fP
|
|
.PP
|
|
\fBbtrfs\fP \fBdevice show\fP\fI [--all-devices|<uuid>|<label>]\fP
|
|
@@ -209,6 +211,14 @@ If \fB--all-devices\fP is passed, all the devices under /dev are scanned;
|
|
otherwise the devices list is extracted from the /proc/partitions file.
|
|
.TP
|
|
|
|
+\fBfilesystem csize \fR \fI [-s start] [-e end] <file> \fR
|
|
+Read ordinary and compressed size of extents in the range [start,end) of \fI<file>\fR
|
|
+.IP
|
|
+\fB-s start\fP range start inclusive, accepts K/M/G modifiers
|
|
+.IP
|
|
+\fB-e end\fP range end exclusive, accepts K/M/G modifiers
|
|
+.TP
|
|
+
|
|
\fBdevice balance\fR \fI<path>\fR
|
|
Balance the chunks of the filesystem identified by \fI<path>\fR
|
|
across the devices.
|
|
--
|
|
1.7.6.233.gd79bc
|
|
|