From 8efb6930f95196ec0514fe5e742aa404c51dc931 Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Fri, 29 Feb 2008 11:38:24 -0800
Subject: [PATCH] --- yaml --- r: 89823 b: refs/heads/master c:
 c20932d2c9ba24838a102ac501bf7371b0fe0794 h: refs/heads/master i:   89821:
 4fb050813cb30073b7a438b13ada010ae97f212e   89819:
 ab4a137b13ddfa504834ec4b61a14a1e61f91f95   89815:
 5c1bc0c91702abbec0fd09c8e9c34be50859a996   89807:
 cddf18b8db7fd0bde4f3b6e1df113b75f4fa0947   89791:
 c8b47ee52c78b44d55dd0ecb2e170916aab2299d v: v3

---
 [refs]                       |  2 +-
 trunk/net/appletalk/aarp.c   | 21 ++-------------------
 trunk/net/decnet/af_decnet.c | 21 ++-------------------
 3 files changed, 5 insertions(+), 39 deletions(-)

diff --git a/[refs] b/[refs]
index 84880348809c..65d52f4ae774 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a8c09e73bf6c8b1720b1172cdcabb14fc823cf8
+refs/heads/master: c20932d2c9ba24838a102ac501bf7371b0fe0794
diff --git a/trunk/net/appletalk/aarp.c b/trunk/net/appletalk/aarp.c
index 18058bbc7962..61166f66479f 100644
--- a/trunk/net/appletalk/aarp.c
+++ b/trunk/net/appletalk/aarp.c
@@ -1033,25 +1033,8 @@ static const struct seq_operations aarp_seq_ops = {
 
 static int aarp_seq_open(struct inode *inode, struct file *file)
 {
-	struct seq_file *seq;
-	int rc = -ENOMEM;
-	struct aarp_iter_state *s = kmalloc(sizeof(*s), GFP_KERNEL);
-
-	if (!s)
-		goto out;
-
-	rc = seq_open(file, &aarp_seq_ops);
-	if (rc)
-		goto out_kfree;
-
-	seq	     = file->private_data;
-	seq->private = s;
-	memset(s, 0, sizeof(*s));
-out:
-	return rc;
-out_kfree:
-	kfree(s);
-	goto out;
+	return seq_open_private(file, &aarp_seq_ops,
+			sizeof(struct aarp_iter_state));
 }
 
 const struct file_operations atalk_seq_arp_fops = {
diff --git a/trunk/net/decnet/af_decnet.c b/trunk/net/decnet/af_decnet.c
index acd48ee522d6..23fd95a7ad15 100644
--- a/trunk/net/decnet/af_decnet.c
+++ b/trunk/net/decnet/af_decnet.c
@@ -2320,25 +2320,8 @@ static const struct seq_operations dn_socket_seq_ops = {
 
 static int dn_socket_seq_open(struct inode *inode, struct file *file)
 {
-	struct seq_file *seq;
-	int rc = -ENOMEM;
-	struct dn_iter_state *s = kmalloc(sizeof(*s), GFP_KERNEL);
-
-	if (!s)
-		goto out;
-
-	rc = seq_open(file, &dn_socket_seq_ops);
-	if (rc)
-		goto out_kfree;
-
-	seq		= file->private_data;
-	seq->private	= s;
-	memset(s, 0, sizeof(*s));
-out:
-	return rc;
-out_kfree:
-	kfree(s);
-	goto out;
+	return seq_open_private(file, &dn_socket_seq_ops,
+			sizeof(struct dn_iter_state));
 }
 
 static const struct file_operations dn_socket_seq_fops = {