From 18c8ad82b2db2d5750d143f39e7b2aba5e5449f2 Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Wed, 10 Oct 2007 02:30:23 -0700
Subject: [PATCH] --- yaml --- r: 67011 b: refs/heads/master c:
 31164088d72e1420e53f742b6c0c06f7343551dc h: refs/heads/master i:   67009:
 831c7b611eebd2a40dbbdada5616a74f2a7293d6   67007:
 69f88417c94ec7c849f02d266bf3b5aa3bd2f145 v: v3

---
 [refs]                      |  2 +-
 trunk/net/decnet/dn_neigh.c | 20 ++------------------
 trunk/net/decnet/dn_route.c | 19 ++-----------------
 3 files changed, 5 insertions(+), 36 deletions(-)

diff --git a/[refs] b/[refs]
index 4443ddec7aa6..68d7486d1eb1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2da59133880976586b2d9d81d798222ecafa566
+refs/heads/master: 31164088d72e1420e53f742b6c0c06f7343551dc
diff --git a/trunk/net/decnet/dn_neigh.c b/trunk/net/decnet/dn_neigh.c
index b66e3be3eb84..e851b143cca3 100644
--- a/trunk/net/decnet/dn_neigh.c
+++ b/trunk/net/decnet/dn_neigh.c
@@ -580,24 +580,8 @@ static const struct seq_operations dn_neigh_seq_ops = {
 
 static int dn_neigh_seq_open(struct inode *inode, struct file *file)
 {
-	struct seq_file *seq;
-	int rc = -ENOMEM;
-	struct neigh_seq_state *s = kzalloc(sizeof(*s), GFP_KERNEL);
-
-	if (!s)
-		goto out;
-
-	rc = seq_open(file, &dn_neigh_seq_ops);
-	if (rc)
-		goto out_kfree;
-
-	seq          = file->private_data;
-	seq->private = s;
-out:
-	return rc;
-out_kfree:
-	kfree(s);
-	goto out;
+	return seq_open_private(file, &dn_neigh_seq_ops,
+			sizeof(struct neigh_seq_state));
 }
 
 static const struct file_operations dn_neigh_seq_fops = {
diff --git a/trunk/net/decnet/dn_route.c b/trunk/net/decnet/dn_route.c
index b7ebf9947ebd..97eee5e8fbbe 100644
--- a/trunk/net/decnet/dn_route.c
+++ b/trunk/net/decnet/dn_route.c
@@ -1739,23 +1739,8 @@ static const struct seq_operations dn_rt_cache_seq_ops = {
 
 static int dn_rt_cache_seq_open(struct inode *inode, struct file *file)
 {
-	struct seq_file *seq;
-	int rc = -ENOMEM;
-	struct dn_rt_cache_iter_state *s;
-
-	s = kzalloc(sizeof(*s), GFP_KERNEL);
-	if (!s)
-		goto out;
-	rc = seq_open(file, &dn_rt_cache_seq_ops);
-	if (rc)
-		goto out_kfree;
-	seq		= file->private_data;
-	seq->private	= s;
-out:
-	return rc;
-out_kfree:
-	kfree(s);
-	goto out;
+	return seq_open_private(file, &dn_rt_cache_seq_ops,
+			sizeof(struct dn_rt_cache_iter_state));
 }
 
 static const struct file_operations dn_rt_cache_seq_fops = {