Merge with 2.3.27.

1 files changed, 4 insertions, 25 deletions

diff --git a/net/sunrpc/stats.c b/net/sunrpc/stats.c
index 2749eaac5..1ef445f61 100644
--- a/net/sunrpc/stats.c
+++ b/net/sunrpc/stats.c
@@ -126,14 +126,10 @@ svc_proc_read(char *buffer, char **start, off_t offset, int count,
 static inline struct proc_dir_entry *
 do_register(const char *name, void *data, int issvc)
 {
-	struct proc_dir_entry	*ent;
-
 	dprintk("RPC: registering /proc/net/rpc/%s\n", name);
-	ent = create_proc_entry(name, 0, proc_net_rpc);
-	ent->read_proc = issvc? svc_proc_read : rpc_proc_read;
-	ent->data = data;
-
-	return ent;
+	return create_proc_read_entry(name, 0, proc_net_rpc, 
+				      issvc? svc_proc_read : rpc_proc_read,
+				      data);
 }
 
 struct proc_dir_entry *
@@ -168,9 +164,7 @@ rpc_proc_init(void)
 		struct proc_dir_entry *ent;
 		ent = create_proc_entry("net/rpc", S_IFDIR, 0);
 		if (ent) {
-#ifdef MODULE
-			ent->fill_inode = rpc_modcount;
-#endif
+			ent->owner = THIS_MODULE;
 			proc_net_rpc = ent;
 		}
 	}
@@ -187,21 +181,6 @@ rpc_proc_exit(void)
 }
 
 #ifdef MODULE
-/*
- * This is called as the proc_dir_entry fill_inode function
- * when an inode is going into or out of service (fill == 1
- * or 0 respectively).
- *
- * We use it here to keep the module from being unloaded
- * while /proc inodes are in use.
- */
-void rpc_modcount(struct inode *inode, int fill)
-{
-	if (fill)
-		MOD_INC_USE_COUNT;
-	else
-		MOD_DEC_USE_COUNT;
-}
 
 int
 init_module(void)