From 5268753793406a665550bd01131184aeaff57274 Mon Sep 17 00:00:00 2001
From: "Denis V. Lunev" <den@openvz.org>
Date: Fri, 2 May 2008 02:44:36 -0700
Subject: [PATCH] --- yaml --- r: 95881 b: refs/heads/master c:
 e7fe23363bab0488c7ce09626900e7d621ea2292 h: refs/heads/master i:   95879:
 33aa6c0afbee6f1a7d6e770eb90e9382c2eb7085 v: v3

---
 [refs]                   |  2 +-
 trunk/net/sunrpc/cache.c | 15 ++++++---------
 trunk/net/sunrpc/stats.c |  8 +-------
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 299a609a8791..fa174bb5c5f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb65f180e02dde224af256b43d3ab2c28b9689d7
+refs/heads/master: e7fe23363bab0488c7ce09626900e7d621ea2292
diff --git a/trunk/net/sunrpc/cache.c b/trunk/net/sunrpc/cache.c
index d75530ff2a6d..c9966713282a 100644
--- a/trunk/net/sunrpc/cache.c
+++ b/trunk/net/sunrpc/cache.c
@@ -316,31 +316,28 @@ static int create_cache_proc_entries(struct cache_detail *cd)
 	cd->proc_ent->owner = cd->owner;
 	cd->channel_ent = cd->content_ent = NULL;
 
-	p = proc_create("flush", S_IFREG|S_IRUSR|S_IWUSR,
-			cd->proc_ent, &cache_flush_operations);
+	p = proc_create_data("flush", S_IFREG|S_IRUSR|S_IWUSR,
+			     cd->proc_ent, &cache_flush_operations, cd);
 	cd->flush_ent = p;
 	if (p == NULL)
 		goto out_nomem;
 	p->owner = cd->owner;
-	p->data = cd;
 
 	if (cd->cache_request || cd->cache_parse) {
-		p = proc_create("channel", S_IFREG|S_IRUSR|S_IWUSR,
-				cd->proc_ent, &cache_file_operations);
+		p = proc_create_data("channel", S_IFREG|S_IRUSR|S_IWUSR,
+				     cd->proc_ent, &cache_file_operations, cd);
 		cd->channel_ent = p;
 		if (p == NULL)
 			goto out_nomem;
 		p->owner = cd->owner;
-		p->data = cd;
 	}
 	if (cd->cache_show) {
-		p = proc_create("content", S_IFREG|S_IRUSR|S_IWUSR,
-				cd->proc_ent, &content_file_operations);
+		p = proc_create_data("content", S_IFREG|S_IRUSR|S_IWUSR,
+				cd->proc_ent, &content_file_operations, cd);
 		cd->content_ent = p;
 		if (p == NULL)
 			goto out_nomem;
 		p->owner = cd->owner;
-		p->data = cd;
 	}
 	return 0;
 out_nomem:
diff --git a/trunk/net/sunrpc/stats.c b/trunk/net/sunrpc/stats.c
index c6061a4346c8..50b049c6598a 100644
--- a/trunk/net/sunrpc/stats.c
+++ b/trunk/net/sunrpc/stats.c
@@ -224,16 +224,10 @@ EXPORT_SYMBOL_GPL(rpc_print_iostats);
 static inline struct proc_dir_entry *
 do_register(const char *name, void *data, const struct file_operations *fops)
 {
-	struct proc_dir_entry *ent;
-
 	rpc_proc_init();
 	dprintk("RPC:       registering /proc/net/rpc/%s\n", name);
 
-	ent = proc_create(name, 0, proc_net_rpc, fops);
-	if (ent) {
-		ent->data = data;
-	}
-	return ent;
+	return proc_create_data(name, 0, proc_net_rpc, fops, data);
 }
 
 struct proc_dir_entry *