X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=libcfs%2Flibcfs%2Flinux%2Flinux-proc.c;h=d5a979b4760f08b3ad9f58963f83b48d1ad755c9;hp=113dc1835c66be8a798d71c442d5737c4863dd22;hb=5655ee76f5c7573c9ad076a92df6388f27b65196;hpb=bb340f259f68f4e77907ec75a9349181caf19764

diff --git a/libcfs/libcfs/linux/linux-proc.c b/libcfs/libcfs/linux/linux-proc.c
index 113dc18..d5a979b 100644
--- a/libcfs/libcfs/linux/linux-proc.c
+++ b/libcfs/libcfs/linux/linux-proc.c
@@ -76,11 +76,9 @@ extern char lnet_upcall[1024];
  */
 extern char lnet_debug_log_upcall[1024];
 
-int
-proc_call_handler(void *data, int write,
-                  loff_t *ppos, void *buffer, size_t *lenp,
-                  int (*handler)(void *data, int write,
-                                 loff_t pos, void *buffer, int len))
+int lprocfs_call_handler(void *data, int write, loff_t *ppos, void *buffer,
+			 size_t *lenp, int (*handler)(void *data, int write,
+			 loff_t pos, void *buffer, int len))
 {
         int rc = handler(data, write, *ppos, buffer, *lenp);
 
@@ -95,7 +93,7 @@ proc_call_handler(void *data, int write,
         }
         return 0;
 }
-EXPORT_SYMBOL(proc_call_handler);
+EXPORT_SYMBOL(lprocfs_call_handler);
 
 static int __proc_dobitmasks(void *data, int write,
                              loff_t pos, void *buffer, int nob)
@@ -138,7 +136,13 @@ static int __proc_dobitmasks(void *data, int write,
         return rc;
 }
 
-DECLARE_PROC_HANDLER(proc_dobitmasks)
+static int
+proc_dobitmasks(struct ctl_table *table, int write,
+		void __user *buffer, size_t *lenp, loff_t *ppos)
+{
+	return lprocfs_call_handler(table->data, write, ppos, buffer, lenp,
+				    __proc_dobitmasks);
+}
 
 static int min_watchdog_ratelimit = 0;          /* disable ratelimiting */
 static int max_watchdog_ratelimit = (24*60*60); /* limit to once per day */
@@ -152,7 +156,13 @@ static int __proc_dump_kernel(void *data, int write,
         return cfs_trace_dump_debug_buffer_usrstr(buffer, nob);
 }
 
-DECLARE_PROC_HANDLER(proc_dump_kernel)
+static int
+proc_dump_kernel(struct ctl_table *table, int write, void __user *buffer,
+		 size_t *lenp, loff_t *ppos)
+{
+	return lprocfs_call_handler(table->data, write, ppos, buffer, lenp,
+				    __proc_dump_kernel);
+}
 
 static int __proc_daemon_file(void *data, int write,
                               loff_t pos, void *buffer, int nob)
@@ -170,7 +180,13 @@ static int __proc_daemon_file(void *data, int write,
         return cfs_trace_daemon_command_usrstr(buffer, nob);
 }
 
-DECLARE_PROC_HANDLER(proc_daemon_file)
+static int
+proc_daemon_file(struct ctl_table *table, int write, void __user *buffer,
+		 size_t *lenp, loff_t *ppos)
+{
+	return lprocfs_call_handler(table->data, write, ppos, buffer, lenp,
+				     __proc_daemon_file);
+}
 
 static int __proc_debug_mb(void *data, int write,
                            loff_t pos, void *buffer, int nob)
@@ -190,9 +206,17 @@ static int __proc_debug_mb(void *data, int write,
         return cfs_trace_set_debug_mb_usrstr(buffer, nob);
 }
 
-DECLARE_PROC_HANDLER(proc_debug_mb)
+static int
+proc_debug_mb(struct ctl_table *table, int write, void __user *buffer,
+	      size_t *lenp, loff_t *ppos)
+{
+	return lprocfs_call_handler(table->data, write, ppos, buffer, lenp,
+				    __proc_debug_mb);
+}
 
-int LL_PROC_PROTO(proc_console_max_delay_cs)
+static int
+proc_console_max_delay_cs(struct ctl_table *table, int write,
+			  void __user *buffer, size_t *lenp, loff_t *ppos)
 {
 	int rc, max_delay_cs;
 	struct ctl_table dummy = *table;
@@ -223,7 +247,9 @@ int LL_PROC_PROTO(proc_console_max_delay_cs)
         return rc;
 }
 
-int LL_PROC_PROTO(proc_console_min_delay_cs)
+static int
+proc_console_min_delay_cs(struct ctl_table *table, int write,
+			  void __user *buffer, size_t *lenp, loff_t *ppos)
 {
 	int rc, min_delay_cs;
 	struct ctl_table dummy = *table;
@@ -254,7 +280,9 @@ int LL_PROC_PROTO(proc_console_min_delay_cs)
 	return rc;
 }
 
-int LL_PROC_PROTO(proc_console_backoff)
+static int
+proc_console_backoff(struct ctl_table *table, int write, void __user *buffer,
+		     size_t *lenp, loff_t *ppos)
 {
 	int rc, backoff;
 	struct ctl_table dummy = *table;
@@ -281,14 +309,18 @@ int LL_PROC_PROTO(proc_console_backoff)
 	return rc;
 }
 
-int LL_PROC_PROTO(libcfs_force_lbug)
+static int
+libcfs_force_lbug(struct ctl_table *table, int write, void __user *buffer,
+		  size_t *lenp, loff_t *ppos)
 {
         if (write)
                 LBUG();
         return 0;
 }
 
-int LL_PROC_PROTO(proc_fail_loc)
+static int
+proc_fail_loc(struct ctl_table *table, int write, void __user *buffer,
+	      size_t *lenp, loff_t *ppos)
 {
 	int rc;
 	long old_fail_loc = cfs_fail_loc;
@@ -339,7 +371,14 @@ static int __proc_cpt_table(void *data, int write,
 		LIBCFS_FREE(buf, len);
 	return rc;
 }
-DECLARE_PROC_HANDLER(proc_cpt_table)
+
+static int
+proc_cpt_table(struct ctl_table *table, int write, void __user *buffer,
+	       size_t *lenp, loff_t *ppos)
+{
+	return lprocfs_call_handler(table->data, write, ppos, buffer, lenp,
+				     __proc_cpt_table);
+}
 
 static struct ctl_table lnet_table[] = {
 	/*