p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

scsi: qedf: fix LTO-enabled build 

The prototype for qedf_dbg_fops/qedf_debugfs_ops doesn't match the definition,
which causes the final link to fail with link-time optimizations:

drivers/scsi/qedf/qedf_main.c:34: error: type of 'qedf_dbg_fops' does not match original declaration [-Werror=lto-type-mismatch]
 extern struct file_operations qedf_dbg_fops;

drivers/scsi/qedf/qedf_debugfs.c:443: note: 'qedf_dbg_fops' was previously declared here
 const struct file_operations qedf_dbg_fops[] = {

drivers/scsi/qedf/qedf_main.c:33: error: type of 'qedf_debugfs_ops' does not match original declaration [-Werror=lto-type-mismatch]
 extern struct qedf_debugfs_ops qedf_debugfs_ops;

drivers/scsi/qedf/qedf_debugfs.c:102: note: 'qedf_debugfs_ops' was previously declared here
 struct qedf_debugfs_ops qedf_debugfs_ops[] = {

This corrects the prototype and moves it into a shared header file where it
belongs. The file operations can also be marked 'const' like the
qedf_debugfs_ops.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Chad Dupuis <chad.dupuis@cavium.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Arnd Bergmann 2018-02-02 14:12:18 +01:00 committed by Martin K. Petersen
parent bc2e1299a8
commit d9ea463a1c
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/scsi/qedf/qedf_dbg.h
View File

@ -116,6 +116,14 @@ extern int qedf_create_sysfs_attr(struct Scsi_Host *shost,
extern void qedf_remove_sysfs_attr(struct Scsi_Host *shost, extern void qedf_remove_sysfs_attr(struct Scsi_Host *shost,
struct sysfs_bin_attrs *iter); struct sysfs_bin_attrs *iter);
struct qedf_debugfs_ops {
char *name;
struct qedf_list_of_funcs *qedf_funcs;
};
extern const struct qedf_debugfs_ops qedf_debugfs_ops[];
extern const struct file_operations qedf_dbg_fops[];
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS
/* DebugFS related code */ /* DebugFS related code */
struct qedf_list_of_funcs { struct qedf_list_of_funcs {
@ -123,11 +131,6 @@ struct qedf_list_of_funcs {
ssize_t (*oper_func)(struct qedf_dbg_ctx *qedf); ssize_t (*oper_func)(struct qedf_dbg_ctx *qedf);
}; };
struct qedf_debugfs_ops {
char *name;
struct qedf_list_of_funcs *qedf_funcs;
};
#define qedf_dbg_fileops(drv, ops) \ #define qedf_dbg_fileops(drv, ops) \
{ \ { \
.owner = THIS_MODULE, \ .owner = THIS_MODULE, \
@ -147,8 +150,8 @@ struct qedf_debugfs_ops {
} }
extern void qedf_dbg_host_init(struct qedf_dbg_ctx *qedf, extern void qedf_dbg_host_init(struct qedf_dbg_ctx *qedf,
struct qedf_debugfs_ops *dops, const struct qedf_debugfs_ops *dops,
struct file_operations *fops); const struct file_operations *fops);
extern void qedf_dbg_host_exit(struct qedf_dbg_ctx *qedf); extern void qedf_dbg_host_exit(struct qedf_dbg_ctx *qedf);
extern void qedf_dbg_init(char *drv_name); extern void qedf_dbg_init(char *drv_name);
extern void qedf_dbg_exit(void); extern void qedf_dbg_exit(void);

6
drivers/scsi/qedf/qedf_debugfs.c
View File

@ -23,8 +23,8 @@ static struct dentry *qedf_dbg_root;
**/ **/
void void
qedf_dbg_host_init(struct qedf_dbg_ctx *qedf, qedf_dbg_host_init(struct qedf_dbg_ctx *qedf,
struct qedf_debugfs_ops *dops, const struct qedf_debugfs_ops *dops,
struct file_operations *fops) const struct file_operations *fops)
{ {
char host_dirname[32]; char host_dirname[32];
struct dentry *file_dentry = NULL; struct dentry *file_dentry = NULL;
@ -99,7 +99,7 @@ qedf_dbg_exit(void)
qedf_dbg_root = NULL; qedf_dbg_root = NULL;
} }
struct qedf_debugfs_ops qedf_debugfs_ops[] = { const struct qedf_debugfs_ops qedf_debugfs_ops[] = {
{ "fp_int", NULL }, { "fp_int", NULL },
{ "io_trace", NULL }, { "io_trace", NULL },
{ "debug", NULL }, { "debug", NULL },

8
drivers/scsi/qedf/qedf_main.c
View File

@ -23,6 +23,7 @@
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <linux/cpu.h> #include <linux/cpu.h>
#include "qedf.h" #include "qedf.h"
#include "qedf_dbg.h"
#include <uapi/linux/pci_regs.h> #include <uapi/linux/pci_regs.h>
const struct qed_fcoe_ops *qed_ops; const struct qed_fcoe_ops *qed_ops;
@ -30,9 +31,6 @@ const struct qed_fcoe_ops *qed_ops;
static int qedf_probe(struct pci_dev *pdev, const struct pci_device_id *id); static int qedf_probe(struct pci_dev *pdev, const struct pci_device_id *id);
static void qedf_remove(struct pci_dev *pdev); static void qedf_remove(struct pci_dev *pdev);
extern struct qedf_debugfs_ops qedf_debugfs_ops;
extern struct file_operations qedf_dbg_fops;
/* /*
* Driver module parameters. * Driver module parameters.
*/ */
@ -3155,8 +3153,8 @@ static int __qedf_probe(struct pci_dev *pdev, int mode)
} }
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS
qedf_dbg_host_init(&(qedf->dbg_ctx), &qedf_debugfs_ops, qedf_dbg_host_init(&(qedf->dbg_ctx), qedf_debugfs_ops,
&qedf_dbg_fops); qedf_dbg_fops);
#endif #endif
/* Start LL2 */ /* Start LL2 */