From: Sage Weil <sage@redhat.com>
Date: Fri, 24 Mar 2017 00:31:37 +0000 (-0500)
Subject: common/blkdev: take queue/ prefix as part of property name
X-Git-Tag: v12.0.2~164^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5178069e09b7e0babc4a1951421e3c028f8ede59;p=ceph.git

common/blkdev: take queue/ prefix as part of property name

This way we can get at properties in device/ too.

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

diff --git a/src/common/blkdev.cc b/src/common/blkdev.cc
index 17fe0e6ac83..23818fcf52b 100644
--- a/src/common/blkdev.cc
+++ b/src/common/blkdev.cc
@@ -141,7 +141,7 @@ int64_t get_block_device_int_property(const char *devname, const char *property)
     return r;
 
   snprintf(filename, sizeof(filename),
-	   "%s/sys/block/%s/queue/%s", sandbox_dir, basename, property);
+	   "%s/sys/block/%s/%s", sandbox_dir, basename, property);
 
   FILE *fp = fopen(filename, "r");
   if (fp == NULL) {
@@ -170,7 +170,7 @@ int64_t get_block_device_int_property(const char *devname, const char *property)
 
 bool block_device_support_discard(const char *devname)
 {
-  return get_block_device_int_property(devname, "discard_granularity") > 0;
+  return get_block_device_int_property(devname, "queue/discard_granularity") > 0;
 }
 
 int block_device_discard(int fd, int64_t offset, int64_t len)
@@ -181,7 +181,7 @@ int block_device_discard(int fd, int64_t offset, int64_t len)
 
 bool block_device_is_rotational(const char *devname)
 {
-  return get_block_device_int_property(devname, "rotational") > 0;
+  return get_block_device_int_property(devname, "queue/rotational") > 0;
 }
 
 int get_device_by_uuid(uuid_d dev_uuid, const char* label, char* partition,
diff --git a/src/test/common/test_blkdev.cc b/src/test/common/test_blkdev.cc
index 33889685eb0..d750ac5999f 100644
--- a/src/test/common/test_blkdev.cc
+++ b/src/test/common/test_blkdev.cc
@@ -47,7 +47,7 @@ TEST(blkdev, get_block_device_base) {
       printf("  got '%s' expected '%s'\n", buf3, de->d_name);
       ASSERT_EQ(0, strcmp(de->d_name, buf3));
       printf("  discard granularity = %lld .. supported = %d\n",
-	     (long long)get_block_device_int_property(base, "discard_granularity"),
+	     (long long)get_block_device_int_property(base, "queue/discard_granularity"),
 	     (int)block_device_support_discard(base));
 
       char subdirfn[PATH_MAX];
@@ -74,7 +74,7 @@ TEST(blkdev, get_block_device_base) {
 	printf("  got '%s' expected '%s'\n", buf3, de->d_name);
 	ASSERT_EQ(0, strcmp(buf3, de->d_name));
 	printf("  discard granularity = %lld .. supported = %d\n",
-	       (long long)get_block_device_int_property(part, "discard_granularity"),
+	       (long long)get_block_device_int_property(part, "queue/discard_granularity"),
 	       (int)block_device_support_discard(part));
       }