Use exported symbol bdevname() instead of disk_name()

[lttng-modules.git] / wrapper / genhd.h

diff --git a/wrapper/genhd.h b/wrapper/genhd.h
index 4184bd011d3e9dc8c23c607cbf7f379abe4f3bf2..4eac2c1a14c62ed74a316a98ff4228f4478352da 100644 (file)
--- a/wrapper/genhd.h
+++ b/wrapper/genhd.h
@@ -1,7 +1,5 @@
-#ifndef _LTTNG_WRAPPER_GENHD_H
-#define _LTTNG_WRAPPER_GENHD_H
-
-/*
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
  * wrapper/genhd.h
  *
  * wrapper around block layer functions and data structures. Using
@@ -9,55 +7,18 @@
  * kernel that exports this function to GPL modules.
  *
  * Copyright (C) 2011-2014 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef _LTTNG_WRAPPER_GENHD_H
+#define _LTTNG_WRAPPER_GENHD_H
+
 #include <linux/genhd.h>
 
-#ifdef CONFIG_KALLSYMS
+#ifdef CONFIG_KALLSYMS_ALL
 
 #include <linux/kallsyms.h>
 #include <wrapper/kallsyms.h>
 
-static inline
-char *wrapper_disk_name(struct gendisk *hd, int partno, char *buf)
-{
-       char *(*disk_name_sym)(struct gendisk *hd, int partno, char *buf);
-
-       disk_name_sym = (void *) kallsyms_lookup_funcptr("disk_name");
-       if (disk_name_sym) {
-               return disk_name_sym(hd, partno, buf);
-       } else {
-               printk(KERN_WARNING "LTTng: disk_name symbol lookup failed.\n");
-               return NULL;
-       }
-}
-
-#else
-
-static inline
-char *wrapper_disk_name(struct gendisk *hd, int partno, char *buf)
-{
-       return disk_name(hd, partno, buf);
-}
-
-#endif
-
-#ifdef CONFIG_KALLSYMS_ALL
-
 static inline
 struct class *wrapper_get_block_class(void)
 {
@@ -65,7 +26,7 @@ struct class *wrapper_get_block_class(void)
 
        ptr_block_class = (struct class *) kallsyms_lookup_dataptr("block_class");
        if (!ptr_block_class) {
-               printk(KERN_WARNING "LTTng: block_class symbol lookup failed.\n");
+               printk_once(KERN_WARNING "LTTng: block_class symbol lookup failed.\n");
                return NULL;
        }
        return ptr_block_class;
@@ -78,7 +39,7 @@ struct device_type *wrapper_get_disk_type(void)
 
        ptr_disk_type = (struct device_type *) kallsyms_lookup_dataptr("disk_type");
        if (!ptr_disk_type) {
-               printk(KERN_WARNING "LTTng: disk_type symbol lookup failed.\n");
+               printk_once(KERN_WARNING "LTTng: disk_type symbol lookup failed.\n");
                return NULL;
        }
        return ptr_disk_type;