btrfs: update ioctls.h

This is what was finally merged for 2.6.37-rc1.

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/os/btrfs_ioctl.h b/src/os/btrfs_ioctl.h
index a69e9cf5100dbcfbaf67ecf1dba6318ee80dd3c2..17c99ebdf96049a8ad028cd6e138355df86f0c9e 100644 (file)
--- a/src/os/btrfs_ioctl.h
+++ b/src/os/btrfs_ioctl.h
@@ -16,23 +16,25 @@
  * Boston, MA 021110-1307, USA.
  */
 
-#ifndef BTRFS_IOCTL_H
-#define BTRFS_IOCTL_H
+#ifndef __IOCTL_
+#define __IOCTL_
 #include <linux/ioctl.h>
 
 #define BTRFS_IOCTL_MAGIC 0x94
 #define BTRFS_VOL_NAME_MAX 255
-#define BTRFS_PATH_NAME_MAX 4087
 
 /* this should be 4k */
+#define BTRFS_PATH_NAME_MAX 4087
 struct btrfs_ioctl_vol_args {
        __s64 fd;
        char name[BTRFS_PATH_NAME_MAX + 1];
 };
 
+#define BTRFS_SNAPSHOT_NAME_MAX 4079
 struct btrfs_ioctl_async_vol_args {
-       struct btrfs_ioctl_vol_args *args;
-       __u64 *transid;
+       __s64 fd;
+       __u64 transid;
+       char name[BTRFS_SNAPSHOT_NAME_MAX + 1];
 };
 
 #define BTRFS_INO_LOOKUP_PATH_MAX 4080
@@ -183,7 +185,7 @@ 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_START_SYNC _IOR(BTRFS_IOCTL_MAGIC, 21, __u64)
+#define BTRFS_IOC_START_SYNC _IOR(BTRFS_IOCTL_MAGIC, 24, __u64)
 #define BTRFS_IOC_WAIT_SYNC  _IOW(BTRFS_IOCTL_MAGIC, 22, __u64)
 #define BTRFS_IOC_SNAP_CREATE_ASYNC _IOW(BTRFS_IOCTL_MAGIC, 23, \
                                   struct btrfs_ioctl_async_vol_args)