| Message ID | 20210316025736.37254-1-yejune.deng@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f105f26e456040ac5ea451ffed02fe4c48f36ac7 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: ipv4: route.c: simplify procfs code | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Guessed tree name to be net-next |
| netdev/subject_prefix | warning | Target tree name not specified in the subject |
| netdev/cc_maintainers | success | CCed 5 of 5 maintainers |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 5 this patch: 5 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 55 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 5 this patch: 5 |
| netdev/header_inline | success | Link |
On Tue, 16 Mar 2021 10:57:36 +0800 Yejune Deng wrote: > proc_creat_seq() that directly take a struct seq_operations, > and deal with network namespaces in ->open. > > Signed-off-by: Yejune Deng <yejune.deng@gmail.com> Looks equivalent to me: Reviewed-by: Jakub Kicinski <kuba@kernel.org>
Hello: This patch was applied to netdev/net-next.git (refs/heads/master): On Tue, 16 Mar 2021 10:57:36 +0800 you wrote: > proc_creat_seq() that directly take a struct seq_operations, > and deal with network namespaces in ->open. > > Signed-off-by: Yejune Deng <yejune.deng@gmail.com> > --- > net/ipv4/route.c | 34 ++++------------------------------ > 1 file changed, 4 insertions(+), 30 deletions(-) Here is the summary with links: - net: ipv4: route.c: simplify procfs code https://git.kernel.org/netdev/net-next/c/f105f26e4560 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 80bed4242d40..fa68c2612252 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -234,19 +234,6 @@ static const struct seq_operations rt_cache_seq_ops = { .show = rt_cache_seq_show, }; -static int rt_cache_seq_open(struct inode *inode, struct file *file) -{ - return seq_open(file, &rt_cache_seq_ops); -} - -static const struct proc_ops rt_cache_proc_ops = { - .proc_open = rt_cache_seq_open, - .proc_read = seq_read, - .proc_lseek = seq_lseek, - .proc_release = seq_release, -}; - - static void *rt_cpu_seq_start(struct seq_file *seq, loff_t *pos) { int cpu; @@ -324,19 +311,6 @@ static const struct seq_operations rt_cpu_seq_ops = { .show = rt_cpu_seq_show, }; - -static int rt_cpu_seq_open(struct inode *inode, struct file *file) -{ - return seq_open(file, &rt_cpu_seq_ops); -} - -static const struct proc_ops rt_cpu_proc_ops = { - .proc_open = rt_cpu_seq_open, - .proc_read = seq_read, - .proc_lseek = seq_lseek, - .proc_release = seq_release, -}; - #ifdef CONFIG_IP_ROUTE_CLASSID static int rt_acct_proc_show(struct seq_file *m, void *v) { @@ -367,13 +341,13 @@ static int __net_init ip_rt_do_proc_init(struct net *net) { struct proc_dir_entry *pde; - pde = proc_create("rt_cache", 0444, net->proc_net, - &rt_cache_proc_ops); + pde = proc_create_seq("rt_cache", 0444, net->proc_net, + &rt_cache_seq_ops); if (!pde) goto err1; - pde = proc_create("rt_cache", 0444, - net->proc_net_stat, &rt_cpu_proc_ops); + pde = proc_create_seq("rt_cache", 0444, net->proc_net_stat, + &rt_cpu_seq_ops); if (!pde) goto err2;
proc_creat_seq() that directly take a struct seq_operations, and deal with network namespaces in ->open. Signed-off-by: Yejune Deng <yejune.deng@gmail.com> --- net/ipv4/route.c | 34 ++++------------------------------ 1 file changed, 4 insertions(+), 30 deletions(-)