From 21815fa66ec4cdaa76b54dd52854030d379f32ea Mon Sep 17 00:00:00 2001
From: "Denis V. Lunev" <den@openvz.org>
Date: Fri, 2 May 2008 04:10:08 -0700
Subject: [PATCH] --- yaml --- r: 95887 b: refs/heads/master c:
 84841c3c6cf2ed9a8e0dfd842fb35ef6e2bce091 h: refs/heads/master i:   95885:
 01a41e8c600dc123632bcd61417f43cda3ed044d   95883:
 3c5ebf6bcee71dcfbe1f58291f3913a1d78cb299   95879:
 33aa6c0afbee6f1a7d6e770eb90e9382c2eb7085   95871:
 0260f683e5083219894d217b1d1ecaa630f8b735 v: v3

---
 [refs]                    |  2 +-
 trunk/net/ipv4/tcp_ipv4.c | 10 +++-------
 trunk/net/ipv4/udp.c      |  7 +++----
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index ec0c19fcb906..c3205fa31f5d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d3faa390df9f009d7d76134b2aa1f07990945a4
+refs/heads/master: 84841c3c6cf2ed9a8e0dfd842fb35ef6e2bce091
diff --git a/trunk/net/ipv4/tcp_ipv4.c b/trunk/net/ipv4/tcp_ipv4.c
index 0e9bc120707d..cd601a866c2f 100644
--- a/trunk/net/ipv4/tcp_ipv4.c
+++ b/trunk/net/ipv4/tcp_ipv4.c
@@ -2214,9 +2214,6 @@ static int tcp_seq_open(struct inode *inode, struct file *file)
 	struct tcp_iter_state *s;
 	int err;
 
-	if (unlikely(afinfo == NULL))
-		return -EINVAL;
-
 	err = seq_open_net(inode, file, &afinfo->seq_ops,
 			  sizeof(struct tcp_iter_state));
 	if (err < 0)
@@ -2241,10 +2238,9 @@ int tcp_proc_register(struct net *net, struct tcp_seq_afinfo *afinfo)
 	afinfo->seq_ops.next		= tcp_seq_next;
 	afinfo->seq_ops.stop		= tcp_seq_stop;
 
-	p = proc_net_fops_create(net, afinfo->name, S_IRUGO, &afinfo->seq_fops);
-	if (p)
-		p->data = afinfo;
-	else
+	p = proc_create_data(afinfo->name, S_IRUGO, net->proc_net,
+			     &afinfo->seq_fops, afinfo);
+	if (!p)
 		rc = -ENOMEM;
 	return rc;
 }
diff --git a/trunk/net/ipv4/udp.c b/trunk/net/ipv4/udp.c
index 1f535e315188..db1cb7c96d63 100644
--- a/trunk/net/ipv4/udp.c
+++ b/trunk/net/ipv4/udp.c
@@ -1605,10 +1605,9 @@ int udp_proc_register(struct net *net, struct udp_seq_afinfo *afinfo)
 	afinfo->seq_ops.next		= udp_seq_next;
 	afinfo->seq_ops.stop		= udp_seq_stop;
 
-	p = proc_net_fops_create(net, afinfo->name, S_IRUGO, &afinfo->seq_fops);
-	if (p)
-		p->data = afinfo;
-	else
+	p = proc_create_data(afinfo->name, S_IRUGO, net->proc_net,
+			     &afinfo->seq_fops, afinfo);
+	if (!p)
 		rc = -ENOMEM;
 	return rc;
 }