Merge pull request ceph#64137 from tchaikov/wip-rbd-with-krbd

idryomov · web-flow · commit 0bb7b6d2ccc1 · 2025-06-24T20:37:34.000+02:00
rbd: fix unused function warning when WITH_KRBD is disabled

Reviewed-by: Ilya Dryomov &lt;idryomov@gmail.com&gt;
diff --git a/src/tools/rbd/action/Kernel.cc b/src/tools/rbd/action/Kernel.cc
@@ -270,6 +270,7 @@ static int do_kernel_list(Formatter *f) {
 #endif
 }
 
+#ifdef WITH_KRBD
 static int get_unsupported_features(librbd::Image &image,
                                     uint64_t *unsupported_features)
 {
@@ -373,6 +374,7 @@ static void print_error_description(const char *poolname,
  done:
   std::cout << "In some cases useful info is found in syslog - try \"dmesg | tail\"." << std::endl;
 }
+#endif
 
 static int do_kernel_map(const char *poolname, const char *nspace_name,
                          const char *imgname, const char *snapname,

Original file line number	Diff line number	Diff line change
`@@ -270,6 +270,7 @@ static int do_kernel_list(Formatter *f) {`
`270`	`270`	`#endif`
`271`	`271`	`}`
`272`	`272`
	`273`	`+#ifdef WITH_KRBD`
`273`	`274`	`static int get_unsupported_features(librbd::Image &image,`
`274`	`275`	`uint64_t *unsupported_features)`
`275`	`276`	`{`
`@@ -373,6 +374,7 @@ static void print_error_description(const char *poolname,`
`373`	`374`	`done:`
`374`	`375`	`std::cout << "In some cases useful info is found in syslog - try \"dmesg \| tail\"." << std::endl;`
`375`	`376`	`}`
	`377`	`+#endif`
`376`	`378`
`377`	`379`	`static int do_kernel_map(const char poolname, const char nspace_name,`
`378`	`380`	`const char imgname, const char snapname,`