ocfs2: fix wake_up in unlock_ast

[linux-2.6-omap-h63xx.git] / net / x25 / sysctl_net_x25.c

diff --git a/net/x25/sysctl_net_x25.c b/net/x25/sysctl_net_x25.c
index 2b2e7fd689f3904342b4bb678043c3d5076a24c7..6ebda25c24e96a4471ee7eb8aa3db69b2411075d 100644 (file)
--- a/net/x25/sysctl_net_x25.c
+++ b/net/x25/sysctl_net_x25.c
@@ -18,7 +18,7 @@ static int max_timer[] = { 300 * HZ };
 static struct ctl_table_header *x25_table_header;
 
 static struct ctl_table x25_table[] = {
-        {
+       {
                .ctl_name =     NET_X25_RESTART_REQUEST_TIMEOUT,
                .procname =     "restart_request_timeout",
                .data =         &sysctl_x25_restart_request_timeout,
@@ -29,7 +29,7 @@ static struct ctl_table x25_table[] = {
                .extra1 =       &min_timer,
                .extra2 =       &max_timer,
        },
-        {
+       {
                .ctl_name =     NET_X25_CALL_REQUEST_TIMEOUT,
                .procname =     "call_request_timeout",
                .data =         &sysctl_x25_call_request_timeout,
@@ -40,7 +40,7 @@ static struct ctl_table x25_table[] = {
                .extra1 =       &min_timer,
                .extra2 =       &max_timer,
        },
-        {
+       {
                .ctl_name =     NET_X25_RESET_REQUEST_TIMEOUT,
                .procname =     "reset_request_timeout",
                .data =         &sysctl_x25_reset_request_timeout,
@@ -51,7 +51,7 @@ static struct ctl_table x25_table[] = {
                .extra1 =       &min_timer,
                .extra2 =       &max_timer,
        },
-        {
+       {
                .ctl_name =     NET_X25_CLEAR_REQUEST_TIMEOUT,
                .procname =     "clear_request_timeout",
                .data =         &sysctl_x25_clear_request_timeout,
@@ -62,7 +62,7 @@ static struct ctl_table x25_table[] = {
                .extra1 =       &min_timer,
                .extra2 =       &max_timer,
        },
-        {
+       {
                .ctl_name =     NET_X25_ACK_HOLD_BACK_TIMEOUT,
                .procname =     "acknowledgement_hold_back_timeout",
                .data =         &sysctl_x25_ack_holdback_timeout,
@@ -84,29 +84,15 @@ static struct ctl_table x25_table[] = {
        { 0, },
 };
 
-static struct ctl_table x25_dir_table[] = {
-       {
-               .ctl_name =     NET_X25,
-               .procname =     "x25",
-               .mode =         0555,
-               .child =        x25_table,
-       },
-       { 0, },
-};
-
-static struct ctl_table x25_root_table[] = {
-       {
-               .ctl_name =     CTL_NET,
-               .procname =     "net",
-               .mode =         0555,
-               .child =        x25_dir_table,
-       },
-       { 0, },
+static struct ctl_path x25_path[] = {
+       { .procname = "net", .ctl_name = CTL_NET, },
+       { .procname = "x25", .ctl_name = NET_X25, },
+       { }
 };
 
 void __init x25_register_sysctl(void)
 {
-       x25_table_header = register_sysctl_table(x25_root_table, 1);
+       x25_table_header = register_sysctl_paths(x25_path, x25_table);
 }
 
 void x25_unregister_sysctl(void)