filestore: use different encoding for snap async_create

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index 901d2a298e631da650ccde406e1ab166c287a84a..9de56162d244d18aba85a517535e1c3d1731a016 100644 (file)
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -512,6 +512,7 @@ int FileStore::_detect_fs()
           << "           Linux 2.6.32).\n"
           << TEXT_NORMAL;
       return -ENOTTY;
+    }
 
     // start_sync?
     __u64 transid = 0;
@@ -534,11 +535,13 @@ int FileStore::_detect_fs()
 
     if (btrfs_wait_sync) {
       // async snap creation?
+      struct btrfs_ioctl_async_vol_args async_args;
       struct btrfs_ioctl_vol_args volargs;
+      __u64 transid = 0;
+      async_args.args = &volargs;
+      async_args.transid = (__u64 *)&transid;
       volargs.fd = 0;
       strcpy(volargs.name, "async_snap_test");
-      volargs.transid = 0;
-      volargs.reserved = 0;
 
       // remove old one, first
       struct stat st;
@@ -550,7 +553,7 @@ int FileStore::_detect_fs()
       }
 
       volargs.fd = fd;
-      r = ::ioctl(fd, BTRFS_IOC_SNAP_CREATE_ASYNC, &volargs);
+      r = ::ioctl(fd, BTRFS_IOC_SNAP_CREATE_ASYNC, &async_args);
       dout(0) << "mount btrfs SNAP_CREATE_ASYNC got " << r << " " << strerror_r(-r, buf, sizeof(buf)) << dendl;
       if (r == 0 || errno == EEXIST) {
        dout(0) << "mount btrfs SNAP_CREATE_ASYNC is supported" << dendl;
@@ -558,17 +561,9 @@ int FileStore::_detect_fs()
       
        // clean up
        volargs.fd = 0;
-       r = ::ioctl(fd, BTRFS_IOC_SNAP_DESTROY_ASYNC, &volargs);
-       if (r == 0) {
-         dout(0) << "mount btrfs SNAP_DESTROY_ASYNC is supported" << dendl;
-         btrfs_snap_destroy_async = true;
-       } else {
-         dout(0) << "mount btrfs SNAP_DESTROY_ASYNC is NOT supported: "
-                 << strerror_r(-r, buf, sizeof(buf)) << dendl;
-         r = ::ioctl(fd, BTRFS_IOC_SNAP_DESTROY, &volargs);
-         if (r != 0) {
-           dout(0) << "mount btrfs SNAP_DESTROY failed: " << strerror_r(-r, buf, sizeof(buf)) << dendl;
-         }
+       r = ::ioctl(fd, BTRFS_IOC_SNAP_DESTROY, &volargs);
+       if (r != 0) {
+         dout(0) << "mount btrfs SNAP_DESTROY failed: " << strerror_r(-r, buf, sizeof(buf)) << dendl;
        }
       } else {
        dout(0) << "mount btrfs SNAP_CREATE_ASYNC is NOT supported: "
@@ -699,7 +694,7 @@ int FileStore::mount()
       snapargs.fd = 0;
       strcpy(snapargs.name, "current");
       int r = ::ioctl(basedir_fd,
-                     btrfs_snap_destroy_async ? BTRFS_IOC_SNAP_DESTROY_ASYNC:BTRFS_IOC_SNAP_DESTROY,
+                     BTRFS_IOC_SNAP_DESTROY,
                      &snapargs);
       if (r) {
        char buf[80];
@@ -1801,17 +1796,21 @@ void FileStore::sync_entry()
       bool do_snap = btrfs && g_conf.filestore_btrfs_snap;
 
       if (do_snap) {
-       btrfs_ioctl_vol_args snapargs;
+       struct btrfs_ioctl_async_vol_args async_args;
+       struct btrfs_ioctl_vol_args snapargs;
+       __u64 transid = 0;
+       async_args.transid = &transid;
+       async_args.args = &snapargs;
        snapargs.fd = current_fd;
        snprintf(snapargs.name, sizeof(snapargs.name), COMMIT_SNAP_ITEM, (long long unsigned)cp);
 
        if (btrfs_snap_create_async) {
          // be smart!
          dout(10) << "taking async snap '" << snapargs.name << "'" << dendl;
-         int r = ::ioctl(basedir_fd, BTRFS_IOC_SNAP_CREATE_ASYNC, &snapargs);
+         int r = ::ioctl(basedir_fd, BTRFS_IOC_SNAP_CREATE_ASYNC, &async_args);
          char buf[100];
          dout(20) << "async snap create '" << snapargs.name
-                  << "' transid " << snapargs.transid
+                  << "' transid " << transid
                   << " got " << r << " " << strerror_r(r < 0 ? errno : 0, buf, sizeof(buf)) << dendl;
          assert(r == 0);
          snaps.push_back(cp);
@@ -1819,9 +1818,9 @@ void FileStore::sync_entry()
          commit_started();
 
          // wait for commit
-         dout(20) << " waiting for transid " << snapargs.transid << " to complete" << dendl;
-         ::ioctl(op_fd, BTRFS_IOC_WAIT_SYNC, &snapargs.transid);
-         dout(20) << " done waiting for transid " << snapargs.transid << " to complete" << dendl;
+         dout(20) << " waiting for transid " << transid << " to complete" << dendl;
+         ::ioctl(op_fd, BTRFS_IOC_WAIT_SYNC, &transid);
+         dout(20) << " done waiting for transid " << transid << " to complete" << dendl;
 
        } else {
          // the synchronous snap create does a sync.

diff --git a/src/os/FileStore.h b/src/os/FileStore.h
index a8ddcbf78182cbd377bc2377f47257f45d8582f4..dc26e15a34ba33db49d8422547b41ff8f0f38cf3 100644 (file)
--- a/src/os/FileStore.h
+++ b/src/os/FileStore.h
@@ -49,7 +49,6 @@ class FileStore : public JournalingObjectStore {
   bool btrfs_snap_create;
   bool btrfs_snap_destroy;
   bool btrfs_snap_create_async;
-  bool btrfs_snap_destroy_async;
   bool btrfs_wait_sync;
   int fsid_fd, op_fd;
 
@@ -179,7 +178,6 @@ class FileStore : public JournalingObjectStore {
     btrfs_snap_create(false),
     btrfs_snap_destroy(false),
     btrfs_snap_create_async(false),
-    btrfs_snap_destroy_async(false),
     btrfs_wait_sync(false),
     fsid_fd(-1), op_fd(-1),
     attrs(this), fake_attrs(false), 

diff --git a/src/os/btrfs_ioctl.h b/src/os/btrfs_ioctl.h
index 0c33ab730d65b658755bd0d1e0ab960aeaa5ec3e..c1728507bb4d11611618b662bc3ded5542071d47 100644 (file)
--- a/src/os/btrfs_ioctl.h
+++ b/src/os/btrfs_ioctl.h
@@ -22,14 +22,17 @@
 
 #define BTRFS_IOCTL_MAGIC 0x94
 #define BTRFS_VOL_NAME_MAX 255
-#define BTRFS_PATH_NAME_MAX 4071
+#define BTRFS_PATH_NAME_MAX 4087
 
 /* this should be 4k */
 struct btrfs_ioctl_vol_args {
        __s64 fd;
        char name[BTRFS_PATH_NAME_MAX + 1];
-       __u64 transid;
-       __u64 reserved;
+};
+
+struct btrfs_ioctl_async_vol_args {
+       struct btrfs_ioctl_vol_args *args;
+       __u64 *transid;
 };
 
 #define BTRFS_INO_LOOKUP_PATH_MAX 4080
@@ -184,6 +187,4 @@ struct btrfs_ioctl_space_args {
 #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_vol_args)
-#define BTRFS_IOC_SNAP_DESTROY_ASYNC _IOW(BTRFS_IOCTL_MAGIC, 24, \
-                                  struct btrfs_ioctl_vol_args)
 #endif