test_ioctls: remove preferred osd

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>

diff --git a/src/client/ioctl.h b/src/client/ioctl.h
index 3ee680e4ecd93337f4b93b2ebad354f5cdc12d39..c15d3340a76f7577941655be94352b2c5b571c8e 100644 (file)
--- a/src/client/ioctl.h
+++ b/src/client/ioctl.h
@@ -16,7 +16,7 @@
 struct ceph_ioctl_layout {
        __u64 stripe_unit, stripe_count, object_size;
        __u64 data_pool;
-       __s64 preferred_osd;
+       __s64 unused;
 };
 
 #define CEPH_IOC_GET_LAYOUT _IOR(CEPH_IOCTL_MAGIC, 1,          \

diff --git a/src/client/test_ioctls.c b/src/client/test_ioctls.c
index 15320ca71fd91c1c435be42dc341e99f69d137fa..f510cd26ee6ff4e1a8b73875c300c6c9ef76a4f7 100644 (file)
--- a/src/client/test_ioctls.c
+++ b/src/client/test_ioctls.c
@@ -41,8 +41,8 @@ int main(int argc, char **argv)
                 perror("ioctl IOC_GET_LAYOUT error");
                 return 1;
         }
-        printf("layout:\n stripe_unit %lld\n stripe_count %lld\n object_size %lld\n data_pool %lld\n preferred osd %lld\n",
-               (long long)l.stripe_unit, (long long)l.stripe_count, (long long)l.object_size, (long long)l.data_pool, (long long)l.preferred_osd);
+        printf("layout:\n stripe_unit %lld\n stripe_count %lld\n object_size %lld\n data_pool %lld\n",
+               (long long)l.stripe_unit, (long long)l.stripe_count, (long long)l.object_size, (long long)l.data_pool);
 
 
         /* set layout */
@@ -62,8 +62,8 @@ int main(int argc, char **argv)
                perror("ioctl IOC_GET_LAYOUT error");
                return 1;
        }
-       printf("layout:\n stripe_unit %lld\n stripe_count %lld\n object_size %lld\n data_pool %lld\n preferred osd %lld\n",
-              (long long)l.stripe_unit, (long long)l.stripe_count, (long long)l.object_size, (long long)l.data_pool, (long long)l.preferred_osd);
+       printf("layout:\n stripe_unit %lld\n stripe_count %lld\n object_size %lld\n data_pool %lld\n",
+              (long long)l.stripe_unit, (long long)l.stripe_count, (long long)l.object_size, (long long)l.data_pool);
 
        /* dataloc */
        dl.file_offset = atoll(argv[2]);
@@ -116,7 +116,7 @@ int main(int argc, char **argv)
                 perror("ioctl IOC_GET_LAYOUT error");
                 return 1;
         }
-        printf("layout:\n stripe_unit %lld\n stripe_count %lld\n object_size %lld\n data_pool %lld\n preferred osd %lld\n",
-               (long long)l.stripe_unit, (long long)l.stripe_count, (long long)l.object_size, (long long)l.data_pool, (long long)l.preferred_osd);
+        printf("layout:\n stripe_unit %lld\n stripe_count %lld\n object_size %lld\n data_pool %lld\n",
+               (long long)l.stripe_unit, (long long)l.stripe_count, (long long)l.object_size, (long long)l.data_pool);
         return 0;
 }