From f01b6dd54f16bf3223b0ae01ac136fed8c6de6b4 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 19 Apr 2012 21:54:31 -0700 Subject: [PATCH] test_ioctls: remove preferred osd Signed-off-by: Sage Weil --- src/client/ioctl.h | 2 +- src/client/test_ioctls.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/client/ioctl.h b/src/client/ioctl.h index 3ee680e4ecd93..c15d3340a76f7 100644 --- 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 15320ca71fd91..f510cd26ee6ff 100644 --- 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; } -- 2.39.5