From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AB8JxZq+GtlEZuzX3NBXJUR6Lym6ZeL8nnek0tM9u959qO8E4sU3zqH9fVW3iHnKFjDeplDSBU3q ARC-Seal: i=1; a=rsa-sha256; t=1524671379; cv=none; d=google.com; s=arc-20160816; b=HuwEVPSG7K7xspyWp/+atVLdEja5OuBVBV46rCcwzlHTXAmaXCUKHMkbbDy5iHUweD WVY6DKoCRcYSBFGALpVX54hCM3VXylKawEuCq4UZw8fY1AjSqMNsLbq0bJQP4fusVidU tIlEFhvF8xJWA8Q73mk23y1hpcHgB3FUFWam1LkWv9qBVgJd+2AzFKbp8UXn/e6teekw iS7OJm6j02p5kGLRCz7YHm3BsMtKOkC4VXKdg9hFBlxeTFPsSukWHBIE0bdfZVzbBMZz PNEG/quS2Omy51W5qY50z+Tc8ZY/a3kcj8G29904dPAeV7NX0/Gusu2XrJN28tg/uDES 9+rA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=Nr/fMNa2EYIfUJMtZ3v5wAxQojen7+SQUINM1QCPTpU=; b=gqoKom+BFNbOI/83eZolcTLSk+j/haWqEJ/qImRh6nzhUamdlB6dKNHesC+AmRzKi7 OYuzE0oSg0p+y7IXt97X0anNr7rVueZP//EW+uFO3X0ymHDNkJ8uWTDRdH+63E6tcGid ZawoFda0mqLb0axAiLuDsvAe9eN39P4Mpa8PskeDaLV+2GdlCTy3glDMyJCwRhkL46TO L614XI+8+72fa5BPd4LTqcEDfvQJY+bl69HSranCsX2kncRbhCE6NTUjoRzAbBMQSg01 RHQj0k3uUcsi+ngZmw11JTRv1lzm3jUzFSQW/SNvmg252bUtHNmCAaHGB3EIsFvUuNUo imRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=aLOiOIrv; spf=pass (google.com: best guess record for domain of batv+8b59ddf2a3dd4691ec7e+5358+infradead.org+hch@bombadil.srs.infradead.org designates 198.137.202.133 as permitted sender) smtp.mailfrom=BATV+8b59ddf2a3dd4691ec7e+5358+infradead.org+hch@bombadil.srs.infradead.org Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=aLOiOIrv; spf=pass (google.com: best guess record for domain of batv+8b59ddf2a3dd4691ec7e+5358+infradead.org+hch@bombadil.srs.infradead.org designates 198.137.202.133 as permitted sender) smtp.mailfrom=BATV+8b59ddf2a3dd4691ec7e+5358+infradead.org+hch@bombadil.srs.infradead.org From: Christoph Hellwig To: Andrew Morton , Alexander Viro Cc: Alexey Dobriyan , Greg Kroah-Hartman , Jiri Slaby , Alessandro Zummo , Alexandre Belloni , 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 11/40] ipv6/flowlabel: simplify pid namespace lookup Date: Wed, 25 Apr 2018 17:47:58 +0200 Message-Id: <20180425154827.32251-12-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180425154827.32251-1-hch@lst.de> References: <20180425154827.32251-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1598733816436196024?= X-GMAIL-MSGID: =?utf-8?q?1598733816436196024?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 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 --- 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