15 files changed, 67 insertions, 110 deletions

diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c
index 54a4e042f104..7535a7bed2fa 100644
--- a/net/sunrpc/auth.c
+++ b/net/sunrpc/auth.c
@@ -332,9 +332,9 @@ rpcauth_lookup_credcache(struct rpc_auth *auth, struct auth_cred * acred,
                 list_add_tail(&new->cr_lru, &free);
         spin_unlock(&cache->lock);
 found:
-        if (test_bit(RPCAUTH_CRED_NEW, &cred->cr_flags)
-                        && cred->cr_ops->cr_init != NULL
-                        && !(flags & RPCAUTH_LOOKUP_NEW)) {
+        if (test_bit(RPCAUTH_CRED_NEW, &cred->cr_flags) &&
+            cred->cr_ops->cr_init != NULL &&
+            !(flags & RPCAUTH_LOOKUP_NEW)) {
                 int res = cred->cr_ops->cr_init(auth, cred);
                 if (res < 0) {
                         put_rpccred(cred);
diff --git a/net/sunrpc/auth_gss/gss_krb5_seqnum.c b/net/sunrpc/auth_gss/gss_krb5_seqnum.c
index f160be6c1a46..17562b4c35f6 100644
--- a/net/sunrpc/auth_gss/gss_krb5_seqnum.c
+++ b/net/sunrpc/auth_gss/gss_krb5_seqnum.c
@@ -75,8 +75,8 @@ krb5_get_seq_num(struct crypto_blkcipher *key,
         if ((code = krb5_decrypt(key, cksum, buf, plain, 8)))
                 return code;
 
-        if ((plain[4] != plain[5]) || (plain[4] != plain[6])
-                                   || (plain[4] != plain[7]))
+        if ((plain[4] != plain[5]) || (plain[4] != plain[6]) ||
+            (plain[4] != plain[7]))
                 return (s32)KG_BAD_SEQ;
 
         *direction = plain[4];
diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
index f6c51e562a02..e34bc531fcb9 100644
--- a/net/sunrpc/auth_gss/svcauth_gss.c
+++ b/net/sunrpc/auth_gss/svcauth_gss.c
@@ -105,8 +105,8 @@ static int rsi_match(struct cache_head *a, struct cache_head *b)
 {
         struct rsi *item = container_of(a, struct rsi, h);
         struct rsi *tmp = container_of(b, struct rsi, h);
-        return netobj_equal(&item->in_handle, &tmp->in_handle)
-                && netobj_equal(&item->in_token, &tmp->in_token);
+        return netobj_equal(&item->in_handle, &tmp->in_handle) &&
+               netobj_equal(&item->in_token, &tmp->in_token);
 }
 
 static int dup_to_netobj(struct xdr_netobj *dst, char *src, int len)
diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c
index d6eee291a0e2..39bddba53ba1 100644
--- a/net/sunrpc/cache.c
+++ b/net/sunrpc/cache.c
@@ -401,9 +401,8 @@ static int cache_clean(void)
                 for (; ch; cp= & ch->next, ch= *cp) {
                         if (current_detail->nextcheck > ch->expiry_time)
                                 current_detail->nextcheck = ch->expiry_time+1;
-                        if (ch->expiry_time >= get_seconds()
-                            && ch->last_refresh >= current_detail->flush_time
-                                )
+                        if (ch->expiry_time >= get_seconds() &&
+                            ch->last_refresh >= current_detail->flush_time)
                                 continue;
                         if (test_and_clear_bit(CACHE_PENDING, &ch->flags))
                                 cache_dequeue(current_detail, ch);
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index 952f206ff307..538ca433a56c 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -1103,8 +1103,9 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv)
                                 procp->pc_release(rqstp, NULL, rqstp->rq_resp);
                         goto dropit;
                 }
-                if (*statp == rpc_success && (xdr = procp->pc_encode)
-                 && !xdr(rqstp, resv->iov_base+resv->iov_len, rqstp->rq_resp)) {
+                if (*statp == rpc_success &&
+                    (xdr = procp->pc_encode) &&
+                    !xdr(rqstp, resv->iov_base+resv->iov_len, rqstp->rq_resp)) {
                         dprintk("svc: failed to encode reply\n");
                         /* serv->sv_stats->rpcsystemerr++; */
                         *statp = rpc_system_err;
diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
index df124f78ee48..b845e2293dfe 100644
--- a/net/sunrpc/svc_xprt.c
+++ b/net/sunrpc/svc_xprt.c
@@ -129,8 +129,8 @@ static void svc_xprt_free(struct kref *kref)
         struct svc_xprt *xprt =
                 container_of(kref, struct svc_xprt, xpt_ref);
         struct module *owner = xprt->xpt_class->xcl_owner;
-        if (test_bit(XPT_CACHE_AUTH, &xprt->xpt_flags)
-            && xprt->xpt_auth_cache != NULL)
+        if (test_bit(XPT_CACHE_AUTH, &xprt->xpt_flags) &&
+            xprt->xpt_auth_cache != NULL)
                 svcauth_unix_info_release(xprt->xpt_auth_cache);
         xprt->xpt_ops->xpo_free(xprt);
         module_put(owner);
@@ -846,8 +846,8 @@ static void svc_age_temp_xprts(unsigned long closure)
                  * through, close it. */
                 if (!test_and_set_bit(XPT_OLD, &xprt->xpt_flags))
                         continue;
-                if (atomic_read(&xprt->xpt_ref.refcount) > 1
-                    || test_bit(XPT_BUSY, &xprt->xpt_flags))
+                if (atomic_read(&xprt->xpt_ref.refcount) > 1 ||
+                    test_bit(XPT_BUSY, &xprt->xpt_flags))
                         continue;
                 svc_xprt_get(xprt);
                 list_move(le, &to_be_aged);
diff --git a/net/sunrpc/svcauth.c b/net/sunrpc/svcauth.c
index e64109b02aee..4e9393c24687 100644
--- a/net/sunrpc/svcauth.c
+++ b/net/sunrpc/svcauth.c
@@ -46,8 +46,8 @@ svc_authenticate(struct svc_rqst *rqstp, __be32 *authp)
         dprintk("svc: svc_authenticate (%d)\n", flavor);
 
         spin_lock(&authtab_lock);
-        if (flavor >= RPC_AUTH_MAXFLAVOR || !(aops = authtab[flavor])
-                        || !try_module_get(aops->owner)) {
+        if (flavor >= RPC_AUTH_MAXFLAVOR || !(aops = authtab[flavor]) ||
+            !try_module_get(aops->owner)) {
                 spin_unlock(&authtab_lock);
                 *authp = rpc_autherr_badcred;
                 return SVC_DENIED;
diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
index 117f68a8aa40..4a8f6558718a 100644
--- a/net/sunrpc/svcauth_unix.c
+++ b/net/sunrpc/svcauth_unix.c
@@ -125,8 +125,8 @@ static int ip_map_match(struct cache_head *corig, struct cache_head *cnew)
 {
         struct ip_map *orig = container_of(corig, struct ip_map, h);
         struct ip_map *new = container_of(cnew, struct ip_map, h);
-        return strcmp(orig->m_class, new->m_class) == 0
-                && ipv6_addr_equal(&orig->m_addr, &new->m_addr);
+        return strcmp(orig->m_class, new->m_class) == 0 &&
+               ipv6_addr_equal(&orig->m_addr, &new->m_addr);
 }
 static void ip_map_init(struct cache_head *cnew, struct cache_head *citem)
 {
@@ -686,8 +686,7 @@ svcauth_unix_set_client(struct svc_rqst *rqstp)
         case AF_INET:
                 sin = svc_addr_in(rqstp);
                 sin6 = &sin6_storage;
-                ipv6_addr_set(&sin6->sin6_addr, 0, 0,
-                                htonl(0x0000FFFF), sin->sin_addr.s_addr);
+                ipv6_addr_set_v4mapped(sin->sin_addr.s_addr, &sin6->sin6_addr);
                 break;
         case AF_INET6:
                 sin6 = svc_addr_in6(rqstp);
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index 1c246a4f491e..870929e08e5d 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -272,14 +272,14 @@ static int svc_one_sock_name(struct svc_sock *svsk, char *buf, int remaining)
         case PF_INET:
                 len = snprintf(buf, remaining, "ipv4 %s %pI4 %d\n",
                                 proto_name,
-                                &inet_sk(sk)->rcv_saddr,
-                                inet_sk(sk)->num);
+                                &inet_sk(sk)->inet_rcv_saddr,
+                                inet_sk(sk)->inet_num);
                 break;
         case PF_INET6:
                 len = snprintf(buf, remaining, "ipv6 %s %pI6 %d\n",
                                 proto_name,
                                 &inet6_sk(sk)->rcv_saddr,
-                                inet_sk(sk)->num);
+                                inet_sk(sk)->inet_num);
                 break;
         default:
                 len = snprintf(buf, remaining, "*unknown-%d*\n",
@@ -1311,7 +1311,7 @@ static struct svc_sock *svc_setup_socket(struct svc_serv *serv,
         /* Register socket with portmapper */
         if (*errp >= 0 && pmap_register)
                 *errp = svc_register(serv, inet->sk_family, inet->sk_protocol,
-                                     ntohs(inet_sk(inet)->sport));
+                                     ntohs(inet_sk(inet)->inet_sport));
 
         if (*errp < 0) {
                 kfree(svsk);
diff --git a/net/sunrpc/sysctl.c b/net/sunrpc/sysctl.c
index 42f9748ae093..e65dcc613339 100644
--- a/net/sunrpc/sysctl.c
+++ b/net/sunrpc/sysctl.c
@@ -139,46 +139,45 @@ static ctl_table debug_table[] = {
                 .data           = &rpc_debug,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dodebug
+                .proc_handler   = proc_dodebug
         },
         {
                 .procname       = "nfs_debug",
                 .data           = &nfs_debug,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dodebug
+                .proc_handler   = proc_dodebug
         },
         {
                 .procname       = "nfsd_debug",
                 .data           = &nfsd_debug,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dodebug
+                .proc_handler   = proc_dodebug
         },
         {
                 .procname       = "nlm_debug",
                 .data           = &nlm_debug,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dodebug
+                .proc_handler   = proc_dodebug
         },
         {
                 .procname       = "transports",
                 .maxlen         = 256,
                 .mode           = 0444,
-                .proc_handler   = &proc_do_xprt,
+                .proc_handler   = proc_do_xprt,
         },
-        { .ctl_name = 0 }
+        { }
 };
 
 static ctl_table sunrpc_table[] = {
         {
-                .ctl_name       = CTL_SUNRPC,
                 .procname       = "sunrpc",
                 .mode           = 0555,
                 .child          = debug_table
         },
-        { .ctl_name = 0 }
+        { }
 };
 
 #endif
diff --git a/net/sunrpc/xprtrdma/svc_rdma.c b/net/sunrpc/xprtrdma/svc_rdma.c
index 35fb68b9c8ec..5b8a8ff93a25 100644
--- a/net/sunrpc/xprtrdma/svc_rdma.c
+++ b/net/sunrpc/xprtrdma/svc_rdma.c
@@ -120,8 +120,7 @@ static ctl_table svcrdma_parm_table[] = {
                 .data           = &svcrdma_max_requests,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec_minmax,
-                .strategy       = &sysctl_intvec,
+                .proc_handler   = proc_dointvec_minmax,
                 .extra1         = &min_max_requests,
                 .extra2         = &max_max_requests
         },
@@ -130,8 +129,7 @@ static ctl_table svcrdma_parm_table[] = {
                 .data           = &svcrdma_max_req_size,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec_minmax,
-                .strategy       = &sysctl_intvec,
+                .proc_handler   = proc_dointvec_minmax,
                 .extra1         = &min_max_inline,
                 .extra2         = &max_max_inline
         },
@@ -140,8 +138,7 @@ static ctl_table svcrdma_parm_table[] = {
                 .data           = &svcrdma_ord,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec_minmax,
-                .strategy       = &sysctl_intvec,
+                .proc_handler   = proc_dointvec_minmax,
                 .extra1         = &min_ord,
                 .extra2         = &max_ord,
         },
@@ -151,67 +148,65 @@ static ctl_table svcrdma_parm_table[] = {
                 .data           = &rdma_stat_read,
                 .maxlen         = sizeof(atomic_t),
                 .mode           = 0644,
-                .proc_handler   = &read_reset_stat,
+                .proc_handler   = read_reset_stat,
         },
         {
                 .procname       = "rdma_stat_recv",
                 .data           = &rdma_stat_recv,
                 .maxlen         = sizeof(atomic_t),
                 .mode           = 0644,
-                .proc_handler   = &read_reset_stat,
+                .proc_handler   = read_reset_stat,
         },
         {
                 .procname       = "rdma_stat_write",
                 .data           = &rdma_stat_write,
                 .maxlen         = sizeof(atomic_t),
                 .mode           = 0644,
-                .proc_handler   = &read_reset_stat,
+                .proc_handler   = read_reset_stat,
         },
         {
                 .procname       = "rdma_stat_sq_starve",
                 .data           = &rdma_stat_sq_starve,
                 .maxlen         = sizeof(atomic_t),
                 .mode           = 0644,
-                .proc_handler   = &read_reset_stat,
+                .proc_handler   = read_reset_stat,
         },
         {
                 .procname       = "rdma_stat_rq_starve",
                 .data           = &rdma_stat_rq_starve,
                 .maxlen         = sizeof(atomic_t),
                 .mode           = 0644,
-                .proc_handler   = &read_reset_stat,
+                .proc_handler   = read_reset_stat,
         },
         {
                 .procname       = "rdma_stat_rq_poll",
                 .data           = &rdma_stat_rq_poll,
                 .maxlen         = sizeof(atomic_t),
                 .mode           = 0644,
-                .proc_handler   = &read_reset_stat,
+                .proc_handler   = read_reset_stat,
         },
         {
                 .procname       = "rdma_stat_rq_prod",
                 .data           = &rdma_stat_rq_prod,
                 .maxlen         = sizeof(atomic_t),
                 .mode           = 0644,
-                .proc_handler   = &read_reset_stat,
+                .proc_handler   = read_reset_stat,
         },
         {
                 .procname       = "rdma_stat_sq_poll",
                 .data           = &rdma_stat_sq_poll,
                 .maxlen         = sizeof(atomic_t),
                 .mode           = 0644,
-                .proc_handler   = &read_reset_stat,
+                .proc_handler   = read_reset_stat,
         },
         {
                 .procname       = "rdma_stat_sq_prod",
                 .data           = &rdma_stat_sq_prod,
                 .maxlen         = sizeof(atomic_t),
                 .mode           = 0644,
-                .proc_handler   = &read_reset_stat,
-        },
-        {
-                .ctl_name = 0,
+                .proc_handler   = read_reset_stat,
         },
+        { },
 };
 
 static ctl_table svcrdma_table[] = {
@@ -220,21 +215,16 @@ static ctl_table svcrdma_table[] = {
                 .mode           = 0555,
                 .child          = svcrdma_parm_table
         },
-        {
-                .ctl_name = 0,
-        },
+        { },
 };
 
 static ctl_table svcrdma_root_table[] = {
         {
-                .ctl_name       = CTL_SUNRPC,
                 .procname       = "sunrpc",
                 .mode           = 0555,
                 .child          = svcrdma_table
         },
-        {
-                .ctl_name = 0,
-        },
+        { },
 };
 
 void svc_rdma_cleanup(void)
diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
index 9e884383134f..f92e37eb413c 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
@@ -337,10 +337,9 @@ static int rdma_set_ctxt_sge(struct svcxprt_rdma *xprt,
 
 static int rdma_read_max_sge(struct svcxprt_rdma *xprt, int sge_count)
 {
-        if ((RDMA_TRANSPORT_IWARP ==
-             rdma_node_get_transport(xprt->sc_cm_id->
-                                     device->node_type))
-            && sge_count > 1)
+        if ((rdma_node_get_transport(xprt->sc_cm_id->device->node_type) ==
+             RDMA_TRANSPORT_IWARP) &&
+            sge_count > 1)
                 return 1;
         else
                 return min_t(int, sge_count, xprt->sc_max_sge);
diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c
index 9a63f669ece4..7018eef1dcdd 100644
--- a/net/sunrpc/xprtrdma/transport.c
+++ b/net/sunrpc/xprtrdma/transport.c
@@ -86,79 +86,63 @@ static struct ctl_table_header *sunrpc_table_header;
 
 static ctl_table xr_tunables_table[] = {
         {
-                .ctl_name       = CTL_UNNUMBERED,
                 .procname       = "rdma_slot_table_entries",
                 .data           = &xprt_rdma_slot_table_entries,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec_minmax,
-                .strategy       = &sysctl_intvec,
+                .proc_handler   = proc_dointvec_minmax,
                 .extra1         = &min_slot_table_size,
                 .extra2         = &max_slot_table_size
         },
         {
-                .ctl_name       = CTL_UNNUMBERED,
                 .procname       = "rdma_max_inline_read",
                 .data           = &xprt_rdma_max_inline_read,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec,
-                .strategy       = &sysctl_intvec,
+                .proc_handler   = proc_dointvec,
         },
         {
-                .ctl_name       = CTL_UNNUMBERED,
                 .procname       = "rdma_max_inline_write",
                 .data           = &xprt_rdma_max_inline_write,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec,
-                .strategy       = &sysctl_intvec,
+                .proc_handler   = proc_dointvec,
         },
         {
-                .ctl_name       = CTL_UNNUMBERED,
                 .procname       = "rdma_inline_write_padding",
                 .data           = &xprt_rdma_inline_write_padding,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec_minmax,
-                .strategy       = &sysctl_intvec,
+                .proc_handler   = proc_dointvec_minmax,
                 .extra1         = &zero,
                 .extra2         = &max_padding,
         },
         {
-                .ctl_name       = CTL_UNNUMBERED,
                 .procname       = "rdma_memreg_strategy",
                 .data           = &xprt_rdma_memreg_strategy,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec_minmax,
-                .strategy       = &sysctl_intvec,
+                .proc_handler   = proc_dointvec_minmax,
                 .extra1         = &min_memreg,
                 .extra2         = &max_memreg,
         },
         {
-                .ctl_name       = CTL_UNNUMBERED,
                 .procname       = "rdma_pad_optimize",
                 .data           = &xprt_rdma_pad_optimize,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec,
-        },
-        {
-                .ctl_name = 0,
+                .proc_handler   = proc_dointvec,
         },
+        { },
 };
 
 static ctl_table sunrpc_table[] = {
         {
-                .ctl_name       = CTL_SUNRPC,
                 .procname       = "sunrpc",
                 .mode           = 0555,
                 .child          = xr_tunables_table
         },
-        {
-                .ctl_name = 0,
-        },
+        { },
 };
 
 #endif
diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c
index 465aafc2007f..2209aa87d899 100644
--- a/net/sunrpc/xprtrdma/verbs.c
+++ b/net/sunrpc/xprtrdma/verbs.c
@@ -878,8 +878,8 @@ if (strnicmp(ia->ri_id->device->dma_device->bus->name, "pci", 3) == 0) {
          * others indicate a transport condition which has already
          * undergone a best-effort.
          */
-        if (ep->rep_connected == -ECONNREFUSED
-            && ++retry_count <= RDMA_CONNECT_RETRY_MAX) {
+        if (ep->rep_connected == -ECONNREFUSED &&
+            ++retry_count <= RDMA_CONNECT_RETRY_MAX) {
                 dprintk("RPC:       %s: non-peer_reject, retry\n", __func__);
                 goto retry;
         }
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 37c5475ba258..04732d09013e 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -81,46 +81,38 @@ static struct ctl_table_header *sunrpc_table_header;
  */
 static ctl_table xs_tunables_table[] = {
         {
-                .ctl_name       = CTL_SLOTTABLE_UDP,
                 .procname       = "udp_slot_table_entries",
                 .data           = &xprt_udp_slot_table_entries,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec_minmax,
-                .strategy       = &sysctl_intvec,
+                .proc_handler   = proc_dointvec_minmax,
                 .extra1         = &min_slot_table_size,
                 .extra2         = &max_slot_table_size
         },
         {
-                .ctl_name       = CTL_SLOTTABLE_TCP,
                 .procname       = "tcp_slot_table_entries",
                 .data           = &xprt_tcp_slot_table_entries,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec_minmax,
-                .strategy       = &sysctl_intvec,
+                .proc_handler   = proc_dointvec_minmax,
                 .extra1         = &min_slot_table_size,
                 .extra2         = &max_slot_table_size
         },
         {
-                .ctl_name       = CTL_MIN_RESVPORT,
                 .procname       = "min_resvport",
                 .data           = &xprt_min_resvport,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec_minmax,
-                .strategy       = &sysctl_intvec,
+                .proc_handler   = proc_dointvec_minmax,
                 .extra1         = &xprt_min_resvport_limit,
                 .extra2         = &xprt_max_resvport_limit
         },
         {
-                .ctl_name       = CTL_MAX_RESVPORT,
                 .procname       = "max_resvport",
                 .data           = &xprt_max_resvport,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec_minmax,
-                .strategy       = &sysctl_intvec,
+                .proc_handler   = proc_dointvec_minmax,
                 .extra1         = &xprt_min_resvport_limit,
                 .extra2         = &xprt_max_resvport_limit
         },
@@ -129,24 +121,18 @@ static ctl_table xs_tunables_table[] = {
                 .data           = &xs_tcp_fin_timeout,
                 .maxlen         = sizeof(xs_tcp_fin_timeout),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec_jiffies,
-                .strategy       = sysctl_jiffies
-        },
-        {
-                .ctl_name = 0,
+                .proc_handler   = proc_dointvec_jiffies,
         },
+        { },
 };
 
 static ctl_table sunrpc_table[] = {
         {
-                .ctl_name       = CTL_SUNRPC,
                 .procname       = "sunrpc",
                 .mode           = 0555,
                 .child          = xs_tunables_table
         },
-        {
-                .ctl_name = 0,
-        },
+        { },
 };
 
 #endif