summarylogtreecommitdiffstats
path: root/btrfs-progs-4.5.diff
diff options
context:
space:
mode:
authorJonathon Fernyhough2017-10-22 18:28:35 +0100
committerJonathon Fernyhough2017-10-22 18:29:48 +0100
commit375d37de841f2a5babf36af120577bf9561157e9 (patch)
treee0326800e91ace41ec800b989f51a7c8d9c79d91 /btrfs-progs-4.5.diff
parenta84666ad831d45864c88ac4529cc3a6281275830 (diff)
downloadaur-375d37de841f2a5babf36af120577bf9561157e9.tar.gz
Update for 0.8.1
Large update, now includes vmlogd. Requires patch to build against btrfs-progs>=4.5, should be dropped as soon as vendored version is updated.
Diffstat (limited to 'btrfs-progs-4.5.diff')
-rw-r--r--btrfs-progs-4.5.diff27
1 files changed, 27 insertions, 0 deletions
diff --git a/btrfs-progs-4.5.diff b/btrfs-progs-4.5.diff
new file mode 100644
index 000000000000..103ab26dfa41
--- /dev/null
+++ b/btrfs-progs-4.5.diff
@@ -0,0 +1,27 @@
++++ vendor/github.com/docker/docker/daemon/graphdriver/btrfs/btrfs.go
+--- vendor/github.com/docker/docker/daemon/graphdriver/btrfs/btrfs.go
+@@ -7,6 +7,10 @@ package btrfs
+ #include <dirent.h>
+ #include <btrfs/ioctl.h>
+ #include <btrfs/ctree.h>
++
++static void set_name_btrfs_ioctl_vol_args_v2(struct btrfs_ioctl_vol_args_v2* btrfs_struct, const char* value) {
++ snprintf(btrfs_struct->name, BTRFS_SUBVOL_NAME_MAX, "%s", value);
++}
+ */
+ import "C"
+
+@@ -159,9 +163,10 @@ func subvolSnapshot(src, dest, name string) error {
+
+ var args C.struct_btrfs_ioctl_vol_args_v2
+ args.fd = C.__s64(getDirFd(srcDir))
+- for i, c := range []byte(name) {
+- args.name[i] = C.char(c)
+- }
++
++ var cs = C.CString(name)
++ C.set_name_btrfs_ioctl_vol_args_v2(&args, cs)
++ C.free(unsafe.Pointer(cs))
+
+ _, _, errno := syscall.Syscall(syscall.SYS_IOCTL, getDirFd(destDir), C.BTRFS_IOC_SNAP_CREATE_V2,
+ uintptr(unsafe.Pointer(&args)))