Dirk Mueller
a0e284e535
- add scrub subcommand - scan /proc/partitions by default (or use --all-devices for all) - mkfs fixes and improvements - documentation fixes - update from git: - add btrfs-select-super utility - add btrfs-label utility - allow mixed data+metadata (option --mixed) - allow populating new filesystem with files (option --rootdir) - allow discard support in mkfs - lzo support - deprecate 'btrfsctl' 'btrfs-vol' 'btrfs-show' - other bugfixes and documentation improvements OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=104
58 lines
1.8 KiB
Diff
58 lines
1.8 KiB
Diff
From 5cfea320d7c0119589009cd445c8938be5db1d90 Mon Sep 17 00:00:00 2001
|
|
From: Andreas Philipp <philipp.andreas@gmail.com>
|
|
Date: Tue, 26 Apr 2011 10:02:40 +0200
|
|
Subject: [PATCH 08/28] Added support for an additional ioctl.
|
|
|
|
Added BTRFS_IOC_SNAP_CREATE_V2 and struct btrfs_ioctl_vol_args_v2 as
|
|
defined in fs/btrfs/ioctl.h in the kernel sources.
|
|
|
|
Signed-off-by: Andreas Philipp <philipp.andreas@gmail.com>
|
|
Signed-off-by: Hugo Mills <hugo@carfax.org.uk>
|
|
---
|
|
ioctl.h | 17 +++++++++++++++++
|
|
1 files changed, 17 insertions(+), 0 deletions(-)
|
|
|
|
diff --git a/ioctl.h b/ioctl.h
|
|
index bb7b9e0..5aa288b 100644
|
|
--- a/ioctl.h
|
|
+++ b/ioctl.h
|
|
@@ -30,6 +30,20 @@ struct btrfs_ioctl_vol_args {
|
|
char name[BTRFS_PATH_NAME_MAX + 1];
|
|
};
|
|
|
|
+#define BTRFS_SUBVOL_RDONLY (1ULL << 1)
|
|
+#define BTRFS_SUBVOL_NAME_MAX 4039
|
|
+
|
|
+struct btrfs_ioctl_vol_args_v2 {
|
|
+ __s64 fd;
|
|
+ __u64 transid;
|
|
+ __u64 flags;
|
|
+ __u64 unused[4];
|
|
+ char name[BTRFS_SUBVOL_NAME_MAX + 1];
|
|
+};
|
|
+
|
|
+#define BTRFS_FSID_SIZE 16
|
|
+#define BTRFS_UUID_SIZE 16
|
|
+
|
|
struct btrfs_ioctl_search_key {
|
|
/* which root are we searching. 0 is the tree of tree roots */
|
|
__u64 tree_id;
|
|
@@ -139,6 +153,7 @@ struct btrfs_ioctl_space_args {
|
|
struct btrfs_ioctl_space_info spaces[0];
|
|
};
|
|
|
|
+/* 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)
|
|
#define BTRFS_IOC_DEFRAG _IOW(BTRFS_IOCTL_MAGIC, 2, \
|
|
@@ -176,4 +191,6 @@ struct btrfs_ioctl_space_args {
|
|
#define BTRFS_IOC_DEFAULT_SUBVOL _IOW(BTRFS_IOCTL_MAGIC, 19, u64)
|
|
#define BTRFS_IOC_SPACE_INFO _IOWR(BTRFS_IOCTL_MAGIC, 20, \
|
|
struct btrfs_ioctl_space_args)
|
|
+#define BTRFS_IOC_SNAP_CREATE_V2 _IOW(BTRFS_IOCTL_MAGIC, 23, \
|
|
+ struct btrfs_ioctl_vol_args_v2)
|
|
#endif
|
|
--
|
|
1.7.5.2.353.g5df3e
|
|
|