| Message ID | 20200716084728.7944-1-miaoqinglang@huawei.com |
|---|---|
| State | Changes Requested |
| Delegated to: | David Miller |
| Headers | show |
| Series | [-next] hsr: Convert to DEFINE_SHOW_ATTRIBUTE | expand |
From: Qinglang Miao <miaoqinglang@huawei.com> Date: Thu, 16 Jul 2020 16:47:28 +0800 > Use DEFINE_SHOW_ATTRIBUTE macro to simplify the code. > > Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com> This does not apply to the net-next tree.
在 2020/7/18 3:46, David Miller 写道: > From: Qinglang Miao <miaoqinglang@huawei.com> > Date: Thu, 16 Jul 2020 16:47:28 +0800 > >> Use DEFINE_SHOW_ATTRIBUTE macro to simplify the code. >> >> Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com> > > This does not apply to the net-next tree. > . > Hi David, I'm sorry but this patch is based on linux-next rather than net-next. There's a little diffrence because commit <4d4901c6d7> in Linux-next has switched over direct seq_read method calls to seq_read_iter should applied.(linkage listed as below). https://kernel.googlesource.com/pub/scm/linux/kernel/git/next/linux-next/+/4d4901c6d748efab8aab6e7d2405dadaed0bea50 I will send a new patch based on net-next tree if you don't mind. Thanks. Qinglang .
diff --git a/net/hsr/hsr_debugfs.c b/net/hsr/hsr_debugfs.c index d994c83b0..ed7f53475 100644 --- a/net/hsr/hsr_debugfs.c +++ b/net/hsr/hsr_debugfs.c @@ -54,16 +54,7 @@ hsr_node_table_show(struct seq_file *sfp, void *data) return 0; } -/* hsr_node_table_open - Open the node_table file - * - * Description: - * This routine opens a debugfs file node_table of specific hsr device - */ -static int -hsr_node_table_open(struct inode *inode, struct file *filp) -{ - return single_open(filp, hsr_node_table_show, inode->i_private); -} +DEFINE_SHOW_ATTRIBUTE(hsr_node_table); void hsr_debugfs_rename(struct net_device *dev) { @@ -78,13 +69,6 @@ void hsr_debugfs_rename(struct net_device *dev) priv->node_tbl_root = d; } -static const struct file_operations hsr_fops = { - .open = hsr_node_table_open, - .read_iter = seq_read_iter, - .llseek = seq_lseek, - .release = single_release, -}; - /* hsr_debugfs_init - create hsr node_table file for dumping * the node table * @@ -106,7 +90,7 @@ void hsr_debugfs_init(struct hsr_priv *priv, struct net_device *hsr_dev) de = debugfs_create_file("node_table", S_IFREG | 0444, priv->node_tbl_root, priv, - &hsr_fops); + &hsr_node_table_fops); if (IS_ERR(de)) { pr_err("Cannot create hsr node_table file\n"); debugfs_remove(priv->node_tbl_root);
Use DEFINE_SHOW_ATTRIBUTE macro to simplify the code. Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com> --- net/hsr/hsr_debugfs.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-)