From: Christoph Hellwig <hch@lst.de>
To: Andrew Morton <akpm@linux-foundation.org>,
Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Alexey Dobriyan <adobriyan@gmail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jiri Slaby <jslaby@suse.com>, Corey Minyard <minyard@acm.org>,
Alessandro Zummo <a.zummo@towertech.it>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
linux-acpi@vger.kernel.org, drbd-dev@lists.linbit.com,
linux-ide@vger.kernel.org, netdev@vger.kernel.org,
linux-rtc@vger.kernel.org, megaraidlinux.pdl@broadcom.com,
linux-scsi@vger.kernel.org, devel@driverdev.osuosl.org,
linux-afs@lists.infradead.org, linux-ext4@vger.kernel.org,
jfs-discussion@lists.sourceforge.net,
netfilter-devel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 09/39] ipv6/flowlabel: simplify pid namespace lookup
Date: Thu, 19 Apr 2018 14:41:10 +0200 [thread overview]
Message-ID: <20180419124140.9309-10-hch@lst.de> (raw)
In-Reply-To: <20180419124140.9309-1-hch@lst.de>
The shole seq_file sequence already operates under a single RCU lock pair,
so move the pid namespace lookup into it, and stop grabbing a reference
and remove all kinds of boilerplate code.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
net/ipv6/ip6_flowlabel.c | 28 +++++-----------------------
1 file changed, 5 insertions(+), 23 deletions(-)
diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c
index c05c4e82a7ca..a9f221d45ef9 100644
--- a/net/ipv6/ip6_flowlabel.c
+++ b/net/ipv6/ip6_flowlabel.c
@@ -754,7 +754,10 @@ static struct ip6_flowlabel *ip6fl_get_idx(struct seq_file *seq, loff_t pos)
static void *ip6fl_seq_start(struct seq_file *seq, loff_t *pos)
__acquires(RCU)
{
+ struct ip6fl_iter_state *state = ip6fl_seq_private(seq);
+
rcu_read_lock_bh();
+ state->pid_ns = task_active_pid_ns(current);
return *pos ? ip6fl_get_idx(seq, *pos - 1) : SEQ_START_TOKEN;
}
@@ -810,36 +813,15 @@ static const struct seq_operations ip6fl_seq_ops = {
static int ip6fl_seq_open(struct inode *inode, struct file *file)
{
- struct seq_file *seq;
- struct ip6fl_iter_state *state;
- int err;
-
- err = seq_open_net(inode, file, &ip6fl_seq_ops,
+ return seq_open_net(inode, file, &ip6fl_seq_ops,
sizeof(struct ip6fl_iter_state));
-
- if (!err) {
- seq = file->private_data;
- state = ip6fl_seq_private(seq);
- rcu_read_lock();
- state->pid_ns = get_pid_ns(task_active_pid_ns(current));
- rcu_read_unlock();
- }
- return err;
-}
-
-static int ip6fl_seq_release(struct inode *inode, struct file *file)
-{
- struct seq_file *seq = file->private_data;
- struct ip6fl_iter_state *state = ip6fl_seq_private(seq);
- put_pid_ns(state->pid_ns);
- return seq_release_net(inode, file);
}
static const struct file_operations ip6fl_seq_fops = {
.open = ip6fl_seq_open,
.read = seq_read,
.llseek = seq_lseek,
- .release = ip6fl_seq_release,
+ .release = seq_release_net,
};
static int __net_init ip6_flowlabel_proc_init(struct net *net)
--
2.17.0
next prev parent reply other threads:[~2018-04-19 12:41 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-19 12:41 simplify procfs code for seq_file instances Christoph Hellwig
2018-04-19 12:41 ` [PATCH 01/39] net/can: single_open_net needs to be paired with single_release_net Christoph Hellwig
2018-04-19 12:41 ` [PATCH 02/39] proc: introduce proc_create_seq{,_data} Christoph Hellwig
2018-04-19 18:41 ` Alexey Dobriyan
2018-04-24 14:29 ` Christoph Hellwig
2018-04-19 12:41 ` [PATCH 03/39] proc: introduce proc_create_seq_private Christoph Hellwig
2018-04-19 14:18 ` Dan Carpenter
2018-04-24 14:19 ` Christoph Hellwig
2018-04-19 18:50 ` Alexey Dobriyan
2018-04-24 14:29 ` Christoph Hellwig
2018-04-19 12:41 ` [PATCH 04/39] proc: introduce proc_create_single{,_data} Christoph Hellwig
2018-04-19 12:41 ` [PATCH 05/39] ipv{4,6}/udp{,lite}: simplify proc registration Christoph Hellwig
2018-04-19 12:41 ` [PATCH 06/39] ipv{4,6}/tcp: simplify procfs registration Christoph Hellwig
2018-04-19 12:41 ` [PATCH 07/39] ipv{4,6}/ping: simplify proc file creation Christoph Hellwig
2018-04-19 12:41 ` [PATCH 08/39] ipv{4, 6}/raw: simplify ѕeq_file code Christoph Hellwig
2018-04-19 12:41 ` Christoph Hellwig [this message]
2018-04-19 12:41 ` [PATCH 10/39] net/kcm: simplify proc registration Christoph Hellwig
2018-04-19 12:41 ` [PATCH 11/39] netfilter/x_tables: simplify ѕeq_file code Christoph Hellwig
2018-04-19 12:41 ` [PATCH 12/39] net: move seq_file_single_net to <linux/seq_file_net.h> Christoph Hellwig
2018-04-19 12:41 ` [PATCH 13/39] proc: introduce proc_create_net{,_data} Christoph Hellwig
2018-04-19 12:41 ` [PATCH 14/39] proc: introduce proc_create_net_single Christoph Hellwig
2018-04-19 18:44 ` Alexey Dobriyan
2018-04-19 12:41 ` [PATCH 15/39] acpi/battery: simplify procfs code Christoph Hellwig
2018-04-22 9:42 ` Rafael J. Wysocki
2018-04-19 12:41 ` [PATCH 16/39] ipmi: " Christoph Hellwig
2018-04-19 15:29 ` Corey Minyard
2018-04-24 14:16 ` Christoph Hellwig
2018-04-19 12:41 ` [PATCH 17/39] sgi-gru: " Christoph Hellwig
2018-04-19 12:41 ` [PATCH 18/39] megaraid: " Christoph Hellwig
2018-04-19 12:41 ` [PATCH 19/39] sg: " Christoph Hellwig
2018-04-19 12:41 ` [PATCH 20/39] afs: " Christoph Hellwig
2018-04-19 12:41 ` [PATCH 21/39] ext4: " Christoph Hellwig
2018-04-19 12:41 ` [PATCH 22/39] jfs: " Christoph Hellwig
2018-04-19 12:41 ` [PATCH 23/39] staging/rtl8192u: " Christoph Hellwig
2018-04-19 12:41 ` [PATCH 24/39] resource: switch to proc_create_seq_data Christoph Hellwig
2018-04-19 12:41 ` [PATCH 25/39] drbd: switch to proc_create_single Christoph Hellwig
2018-04-19 12:41 ` [PATCH 26/39] rtc/proc: switch to proc_create_single_data Christoph Hellwig
2018-04-19 13:10 ` Alexandre Belloni
2018-04-24 14:15 ` Christoph Hellwig
2018-04-19 12:41 ` [PATCH 27/39] bonding: switch to proc_create_seq_data Christoph Hellwig
2018-04-19 12:41 ` [PATCH 28/39] hostap: switch to proc_create_{seq,single}_data Christoph Hellwig
2018-04-19 12:41 ` [PATCH 29/39] neigh: switch to proc_create_seq_data Christoph Hellwig
2018-04-19 12:41 ` [PATCH 30/39] netfilter/xt_hashlimit: switch to proc_create_{seq,single}_data Christoph Hellwig
2018-04-19 12:41 ` [PATCH 31/39] netfilter/x_tables: switch to proc_create_seq_private Christoph Hellwig
2018-04-19 12:41 ` [PATCH 32/39] bluetooth: switch to proc_create_seq_data Christoph Hellwig
2018-04-19 12:41 ` [PATCH 33/39] atm: simplify procfs code Christoph Hellwig
2018-04-19 12:41 ` [PATCH 34/39] atm: switch to proc_create_seq_private Christoph Hellwig
2018-04-19 12:41 ` [PATCH 35/39] isdn: replace ->proc_fops with ->proc_show Christoph Hellwig
2018-04-19 12:41 ` [PATCH 36/39] proc: don't detour through seq->private to get the inode Christoph Hellwig
2018-04-19 12:41 ` [PATCH 37/39] ide: remove ide_driver_proc_write Christoph Hellwig
2018-04-19 12:41 ` [PATCH 38/39] ide: replace ->proc_fops with ->proc_show Christoph Hellwig
2018-04-19 12:41 ` [PATCH 39/39] tty: " Christoph Hellwig
2018-04-19 13:00 ` [PATCH 20/39] afs: simplify procfs code David Howells
2018-04-19 18:57 ` simplify procfs code for seq_file instances Alexey Dobriyan
2018-04-24 14:23 ` Christoph Hellwig
2018-04-24 15:19 ` Andrew Morton
2018-04-24 16:06 ` Christoph Hellwig
2018-04-25 21:24 ` Alexey Dobriyan
2018-04-20 12:29 ` [PATCH 20/39] afs: simplify procfs code David Howells
2018-04-24 14:12 ` Christoph Hellwig
2018-04-30 14:37 ` David Howells
2018-04-20 12:31 ` [PATCH 01/02] net: Export get_proc_net() David Howells
2018-04-20 12:32 ` [PATCH 02/02] afs: Implement namespacing David Howells
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180419124140.9309-10-hch@lst.de \
--to=hch@lst.de \
--cc=a.zummo@towertech.it \
--cc=adobriyan@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=alexandre.belloni@bootlin.com \
--cc=devel@driverdev.osuosl.org \
--cc=drbd-dev@lists.linbit.com \
--cc=gregkh@linuxfoundation.org \
--cc=jfs-discussion@lists.sourceforge.net \
--cc=jslaby@suse.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-afs@lists.infradead.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rtc@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=megaraidlinux.pdl@broadcom.com \
--cc=minyard@acm.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).