LU-9679 general: avoid bare return; at end of void function

Having:
   return;
}

at the end of a void function is unnecessary noise.
Where it is the *only* statement in the function, it can
be useful, so that remain unchanged.  The rest have been removed.

Test-Parameters: trivial
Signed-off-by: Mr NeilBrown <neilb@suse.de>
Change-Id: If02f6f5b91d4134cf95a68ebccc83df28c360fb2
Reviewed-on: https://review.whamcloud.com/36654
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Shaun Tancheff <stancheff@cray.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Petros Koutoupis <pkoutoupis@cray.com>
Reviewed-by: Ben Evans <bevans@cray.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/libcfs/include/libcfs/libcfs_prim.h b/libcfs/include/libcfs/libcfs_prim.h
index 1001362..50ed7b9 100644 (file)
--- a/libcfs/include/libcfs/libcfs_prim.h
+++ b/libcfs/include/libcfs/libcfs_prim.h
@@ -80,6 +80,5 @@ static inline void cfs_memory_pressure_restore(int old)
                memory_pressure_set();
        else
                memory_pressure_clr();
                memory_pressure_set();
        else
                memory_pressure_clr();

-       return;

 }
 #endif
 }
 #endif

diff --git a/libcfs/libcfs/workitem.c b/libcfs/libcfs/workitem.c
index f370ffa..7768e5c 100644 (file)
--- a/libcfs/libcfs/workitem.c
+++ b/libcfs/libcfs/workitem.c
@@ -126,8 +126,6 @@ cfs_wi_exit(struct cfs_wi_sched *sched, struct cfs_workitem *wi)
 
        wi->wi_scheduled = 1; /* LBUG future schedule attempts */
        spin_unlock(&sched->ws_lock);
 
        wi->wi_scheduled = 1; /* LBUG future schedule attempts */
        spin_unlock(&sched->ws_lock);

-
-       return;

 }
 EXPORT_SYMBOL(cfs_wi_exit);
 
 }
 EXPORT_SYMBOL(cfs_wi_exit);
 


@@ -198,7 +196,6 @@ cfs_wi_schedule(struct cfs_wi_sched *sched, struct cfs_workitem *wi)
 
        LASSERT (!list_empty(&wi->wi_list));
        spin_unlock(&sched->ws_lock);
 
        LASSERT (!list_empty(&wi->wi_list));
        spin_unlock(&sched->ws_lock);

-       return;

 }
 EXPORT_SYMBOL(cfs_wi_schedule);
 
 }
 EXPORT_SYMBOL(cfs_wi_schedule);
 

diff --git a/lnet/klnds/gnilnd/gnilnd_cb.c b/lnet/klnds/gnilnd/gnilnd_cb.c
index 89f8bd2..4e15f7c 100644 (file)
--- a/lnet/klnds/gnilnd/gnilnd_cb.c
+++ b/lnet/klnds/gnilnd/gnilnd_cb.c
@@ -82,7 +82,6 @@ kgnilnd_schedule_device(kgn_device_t *dev)
        if (!already_live) {
                wake_up_all(&dev->gnd_waitq);
        }
        if (!already_live) {
                wake_up_all(&dev->gnd_waitq);
        }

-       return;

 }
 
 void kgnilnd_schedule_device_timer(unsigned long arg)
 }
 
 void kgnilnd_schedule_device_timer(unsigned long arg)


@@ -2071,8 +2070,6 @@ kgnilnd_release_msg(kgn_conn_t *conn)
        GNIDBG_SMSG_CREDS(D_NET, conn);
 
        kgnilnd_schedule_conn(conn);
        GNIDBG_SMSG_CREDS(D_NET, conn);
 
        kgnilnd_schedule_conn(conn);

-
-       return;

 }
 
 void
 }
 
 void


@@ -2096,8 +2093,6 @@ kgnilnd_consume_rx(kgn_rx_t *rx)
        kmem_cache_free(kgnilnd_data.kgn_rx_cache, rx);
        CDEBUG(D_MALLOC, "slab-freed 'rx': %lu at %p.\n",
               sizeof(*rx), rx);
        kmem_cache_free(kgnilnd_data.kgn_rx_cache, rx);
        CDEBUG(D_MALLOC, "slab-freed 'rx': %lu at %p.\n",
               sizeof(*rx), rx);

-
-       return;

 }
 
 int
 }
 
 int


@@ -2978,8 +2973,6 @@ kgnilnd_check_peer_timeouts_locked(kgn_peer_t *peer, struct list_head *todie,
                        }
                }
        }
                        }
                }
        }

-
-       return;

 }
 
 void
 }
 
 void

diff --git a/lnet/klnds/o2iblnd/o2iblnd.c b/lnet/klnds/o2iblnd/o2iblnd.c
index d55e3a0..979447a 100644 (file)
--- a/lnet/klnds/o2iblnd/o2iblnd.c
+++ b/lnet/klnds/o2iblnd/o2iblnd.c
@@ -1255,7 +1255,6 @@ kiblnd_query(struct lnet_ni *ni, lnet_nid_t nid, time64_t *when)
        CDEBUG(D_NET, "peer_ni %s %p, alive %lld secs ago\n",
               libcfs_nid2str(nid), peer_ni,
               last_alive ? now - last_alive : -1);
        CDEBUG(D_NET, "peer_ni %s %p, alive %lld secs ago\n",
               libcfs_nid2str(nid), peer_ni,
               last_alive ? now - last_alive : -1);

-       return;

 }
 
 static void
 }
 
 static void


@@ -3027,7 +3026,6 @@ kiblnd_shutdown(struct lnet_ni *ni)
 out:
        if (list_empty(&kiblnd_data.kib_devs))
                 kiblnd_base_shutdown();
 out:
        if (list_empty(&kiblnd_data.kib_devs))
                 kiblnd_base_shutdown();

-        return;

 }
 
 static int
 }
 
 static int

diff --git a/lnet/klnds/socklnd/socklnd.c b/lnet/klnds/socklnd/socklnd.c
index 6cac4a4..8d74726 100644 (file)
--- a/lnet/klnds/socklnd/socklnd.c
+++ b/lnet/klnds/socklnd/socklnd.c
@@ -1861,7 +1861,6 @@ ksocknal_query(struct lnet_ni *ni, lnet_nid_t nid, time64_t *when)
                 ksocknal_launch_all_connections_locked(peer_ni);
 
        write_unlock_bh(glock);
                 ksocknal_launch_all_connections_locked(peer_ni);
 
        write_unlock_bh(glock);

-        return;

 }
 
 static void
 }
 
 static void


@@ -2512,7 +2511,6 @@ ksocknal_debug_peerhash(struct lnet_ni *ni)
        }
 
        read_unlock(&ksocknal_data.ksnd_global_lock);
        }
 
        read_unlock(&ksocknal_data.ksnd_global_lock);

-       return;

 }
 
 void
 }
 
 void

diff --git a/lnet/klnds/socklnd/socklnd_lib.c b/lnet/klnds/socklnd/socklnd_lib.c
index 93d4b8f..3ac72c9 100644 (file)
--- a/lnet/klnds/socklnd/socklnd_lib.c
+++ b/lnet/klnds/socklnd/socklnd_lib.c
@@ -701,7 +701,6 @@ ksocknal_lib_set_callback(struct socket *sock,  struct ksock_conn *conn)
         sock->sk->sk_user_data = conn;
         sock->sk->sk_data_ready = ksocknal_data_ready;
         sock->sk->sk_write_space = ksocknal_write_space;
         sock->sk->sk_user_data = conn;
         sock->sk->sk_data_ready = ksocknal_data_ready;
         sock->sk->sk_write_space = ksocknal_write_space;

-        return;

 }
 
 void
 }
 
 void

diff --git a/lnet/lnet/api-ni.c b/lnet/lnet/api-ni.c
index 3a68ae8..7d50dcf 100644 (file)
--- a/lnet/lnet/api-ni.c
+++ b/lnet/lnet/api-ni.c
@@ -1615,7 +1615,6 @@ lnet_swap_pinginfo(struct lnet_ping_buffer *pbuf)
                __swab64s(&stat->ns_nid);
                __swab32s(&stat->ns_status);
        }
                __swab64s(&stat->ns_nid);
                __swab32s(&stat->ns_status);
        }

-       return;

 }
 
 int
 }
 
 int

diff --git a/lnet/lnet/lib-move.c b/lnet/lnet/lib-move.c
index 7cc9237..4354c82 100644 (file)
--- a/lnet/lnet/lib-move.c
+++ b/lnet/lnet/lib-move.c
@@ -3823,8 +3823,6 @@ void lnet_monitor_thr_stop(void)
        lnet_clean_local_ni_recoveryq();
        lnet_clean_peer_ni_recoveryq();
        lnet_clean_resendqs();
        lnet_clean_local_ni_recoveryq();
        lnet_clean_peer_ni_recoveryq();
        lnet_clean_resendqs();

-
-       return;

 }
 
 void
 }
 
 void

diff --git a/lnet/lnet/router.c b/lnet/lnet/router.c
index e5ac203..2014e67 100644 (file)
--- a/lnet/lnet/router.c
+++ b/lnet/lnet/router.c
@@ -525,7 +525,6 @@ static void lnet_shuffle_seed(void)
                add_device_randomness(&ni->ni_nid, sizeof(ni->ni_nid));
 
        seeded = 1;
                add_device_randomness(&ni->ni_nid, sizeof(ni->ni_nid));
 
        seeded = 1;

-       return;

 }
 
 /* NB expects LNET_LOCK held */
 }
 
 /* NB expects LNET_LOCK held */

diff --git a/lnet/selftest/brw_test.c b/lnet/selftest/brw_test.c
index a03f607..55c9486 100644 (file)
--- a/lnet/selftest/brw_test.c
+++ b/lnet/selftest/brw_test.c
@@ -371,8 +371,6 @@ brw_client_done_rpc(struct sfw_test_unit *tsu, struct srpc_client_rpc *rpc)
                atomic_inc(&sn->sn_brw_errors);
                rpc->crpc_status = -EBADMSG;
        }
                atomic_inc(&sn->sn_brw_errors);
                rpc->crpc_status = -EBADMSG;
        }

-
-       return;

 }
 
 static void
 }
 
 static void

diff --git a/lnet/selftest/conrpc.c b/lnet/selftest/conrpc.c
index e5d7787..268b2ff 100644 (file)
--- a/lnet/selftest/conrpc.c
+++ b/lnet/selftest/conrpc.c
@@ -457,8 +457,6 @@ lstcon_rpc_trans_stat(struct lstcon_rpc_trans *trans,
                lstcon_rpc_stat_failure(stat, 0),
                lstcon_rpc_stat_total(stat, 0),
                stat->trs_rpc_errno, stat->trs_fwk_errno);
                lstcon_rpc_stat_failure(stat, 0),
                lstcon_rpc_stat_total(stat, 0),
                stat->trs_rpc_errno, stat->trs_fwk_errno);

-
-        return;

 }
 
 int
 }
 
 int


@@ -585,8 +583,6 @@ lstcon_rpc_trans_destroy(struct lstcon_rpc_trans *trans)
               lstcon_rpc_trans_name(trans->tas_opc), count);
 
        LIBCFS_FREE(trans, sizeof(*trans));
               lstcon_rpc_trans_name(trans->tas_opc), count);
 
        LIBCFS_FREE(trans, sizeof(*trans));

-
-       return;

 }
 
 int
 }
 
 int


@@ -1079,8 +1075,6 @@ lstcon_rpc_stat_reply(struct lstcon_rpc_trans *trans, struct srpc_msg *msg,
 
         if (stat->trs_fwk_errno == 0)
                 stat->trs_fwk_errno = rc;
 
         if (stat->trs_fwk_errno == 0)
                 stat->trs_fwk_errno = rc;

-
-        return;

 }
 
 int
 }
 
 int

diff --git a/lnet/selftest/console.c b/lnet/selftest/console.c
index 1e37454..128c9a3 100644 (file)
--- a/lnet/selftest/console.c
+++ b/lnet/selftest/console.c
@@ -322,8 +322,6 @@ lstcon_group_ndlink_move(struct lstcon_group *old,
        list_add_tail(&ndl->ndl_hlink, &new->grp_ndl_hash[idx]);
        list_add_tail(&ndl->ndl_link, &new->grp_ndl_list);
        new->grp_nnode++;
        list_add_tail(&ndl->ndl_hlink, &new->grp_ndl_hash[idx]);
        list_add_tail(&ndl->ndl_link, &new->grp_ndl_list);
        new->grp_nnode++;

-
-       return;

 }
 
 static void
 }
 
 static void

diff --git a/lnet/selftest/framework.c b/lnet/selftest/framework.c
index 1ad3c1e..328331a 100644 (file)
--- a/lnet/selftest/framework.c
+++ b/lnet/selftest/framework.c
@@ -177,7 +177,6 @@ sfw_add_session_timer (void)
         sn->sn_timer_active = 1;
        timer->stt_expires = ktime_get_real_seconds()+ sn->sn_timeout;
         stt_add_timer(timer);
         sn->sn_timer_active = 1;
        timer->stt_expires = ktime_get_real_seconds()+ sn->sn_timeout;
         stt_add_timer(timer);

-        return;

 }
 
 static int
 }
 
 static int


@@ -304,7 +303,6 @@ sfw_server_rpc_done(struct srpc_server_rpc *rpc)
 
         if (rpc->srpc_bulk != NULL)
                 sfw_free_pages(rpc);
 
         if (rpc->srpc_bulk != NULL)
                 sfw_free_pages(rpc);

-        return;

 }
 
 static void
 }
 
 static void


@@ -616,7 +614,6 @@ sfw_unload_test(struct sfw_test_instance *tsi)
         * some buffers behind, but never mind... */
        srpc_service_remove_buffers(tsc->tsc_srv_service,
                                    sfw_test_buffers(tsi));
         * some buffers behind, but never mind... */
        srpc_service_remove_buffers(tsc->tsc_srv_service,
                                    sfw_test_buffers(tsi));

-       return;

 }
 
 static void
 }
 
 static void


@@ -650,7 +647,6 @@ sfw_destroy_test_instance(struct sfw_test_instance *tsi)
 clean:
        sfw_unload_test(tsi);
        LIBCFS_FREE(tsi, sizeof(*tsi));
 clean:
        sfw_unload_test(tsi);
        LIBCFS_FREE(tsi, sizeof(*tsi));

-       return;

 }
 
 static void
 }
 
 static void


@@ -669,7 +665,6 @@ sfw_destroy_batch(struct sfw_batch *tsb)
        }
 
        LIBCFS_FREE(tsb, sizeof(*tsb));
        }
 
        LIBCFS_FREE(tsb, sizeof(*tsb));

-       return;

 }
 
 static void
 }
 
 static void


@@ -689,7 +684,6 @@ sfw_destroy_session(struct sfw_session *sn)
 
        LIBCFS_FREE(sn, sizeof(*sn));
        atomic_dec(&sfw_data.fw_nzombies);
 
        LIBCFS_FREE(sn, sizeof(*sn));
        atomic_dec(&sfw_data.fw_nzombies);

-       return;

 }
 
 static void
 }
 
 static void


@@ -734,7 +728,6 @@ sfw_unpack_addtest_req(struct srpc_msg *msg)
         }
 
        LBUG();
         }
 
        LBUG();

-       return;

 }
 
 static int
 }
 
 static int


@@ -872,7 +865,6 @@ sfw_test_unit_done(struct sfw_test_unit *tsu)
        spin_unlock(&sfw_data.fw_lock);
 
        sfw_destroy_session(sn);
        spin_unlock(&sfw_data.fw_lock);
 
        sfw_destroy_session(sn);

-       return;

 }
 
 static void
 }
 
 static void


@@ -908,7 +900,6 @@ sfw_test_rpc_done(struct srpc_client_rpc *rpc)
         }
 
         sfw_test_unit_done(tsu);
         }
 
         sfw_test_unit_done(tsu);

-        return;

 }
 
 int
 }
 
 int


@@ -1570,7 +1561,6 @@ sfw_unpack_message(struct srpc_msg *msg)
         }
 
         LBUG ();
         }
 
         LBUG ();

-        return;

 }
 
 void
 }
 
 void


@@ -1582,7 +1572,6 @@ sfw_abort_rpc(struct srpc_client_rpc *rpc)
        spin_lock(&rpc->crpc_lock);
        srpc_abort_rpc(rpc, -EINTR);
        spin_unlock(&rpc->crpc_lock);
        spin_lock(&rpc->crpc_lock);
        srpc_abort_rpc(rpc, -EINTR);
        spin_unlock(&rpc->crpc_lock);

-       return;

 }
 
 void
 }
 
 void


@@ -1599,7 +1588,6 @@ sfw_post_rpc(struct srpc_client_rpc *rpc)
        srpc_post_rpc(rpc);
 
        spin_unlock(&rpc->crpc_lock);
        srpc_post_rpc(rpc);
 
        spin_unlock(&rpc->crpc_lock);

-       return;

 }
 
 static struct srpc_service sfw_services[] = {
 }
 
 static struct srpc_service sfw_services[] = {


@@ -1776,6 +1764,4 @@ sfw_shutdown (void)
                list_del(&tsc->tsc_list);
                LIBCFS_FREE(tsc, sizeof(*tsc));
        }
                list_del(&tsc->tsc_list);
                LIBCFS_FREE(tsc, sizeof(*tsc));
        }

-
-       return;

 }
 }

diff --git a/lnet/selftest/ping_test.c b/lnet/selftest/ping_test.c
index 2d1403b..ed16e13 100644 (file)
--- a/lnet/selftest/ping_test.c
+++ b/lnet/selftest/ping_test.c
@@ -161,7 +161,6 @@ ping_client_done_rpc(struct sfw_test_unit *tsu, struct srpc_client_rpc *rpc)
        CDEBUG(D_NET, "%d reply in %llu nsec\n", reply->pnr_seq,
               (u64)((ts.tv_sec - reqst->pnr_time_sec) * NSEC_PER_SEC +
                    (ts.tv_nsec - reqst->pnr_time_nsec)));
        CDEBUG(D_NET, "%d reply in %llu nsec\n", reply->pnr_seq,
               (u64)((ts.tv_sec - reqst->pnr_time_sec) * NSEC_PER_SEC +
                    (ts.tv_nsec - reqst->pnr_time_nsec)));

-        return;

 }
 
 static int
 }
 
 static int

diff --git a/lnet/selftest/rpc.c b/lnet/selftest/rpc.c
index 1ca15dc..52a788c 100644 (file)
--- a/lnet/selftest/rpc.c
+++ b/lnet/selftest/rpc.c
@@ -113,7 +113,6 @@ srpc_free_bulk(struct srpc_bulk *bk)
        }
 
        LIBCFS_FREE(bk, offsetof(struct srpc_bulk, bk_iovs[bk->bk_niov]));
        }
 
        LIBCFS_FREE(bk, offsetof(struct srpc_bulk, bk_iovs[bk->bk_niov]));

-       return;

 }
 
 struct srpc_bulk *
 }
 
 struct srpc_bulk *


@@ -953,7 +952,6 @@ srpc_server_rpc_done(struct srpc_server_rpc *rpc, int status)
        }
 
        spin_unlock(&scd->scd_lock);
        }
 
        spin_unlock(&scd->scd_lock);

-       return;

 }
 
 /* handles an incoming RPC */
 }
 
 /* handles an incoming RPC */


@@ -1105,7 +1103,6 @@ srpc_add_client_rpc_timer(struct srpc_client_rpc *rpc)
        timer->stt_func    = srpc_client_rpc_expired;
        timer->stt_expires = ktime_get_real_seconds() + rpc->crpc_timeout;
        stt_add_timer(timer);
        timer->stt_func    = srpc_client_rpc_expired;
        timer->stt_expires = ktime_get_real_seconds() + rpc->crpc_timeout;
        stt_add_timer(timer);

-       return;

 }
 
 /*
 }
 
 /*


@@ -1169,7 +1166,6 @@ srpc_client_rpc_done(struct srpc_client_rpc *rpc, int status)
        spin_unlock(&rpc->crpc_lock);
 
        (*rpc->crpc_done)(rpc);
        spin_unlock(&rpc->crpc_lock);
 
        (*rpc->crpc_done)(rpc);

-       return;

 }
 
 /* sends an outgoing RPC */
 }
 
 /* sends an outgoing RPC */


@@ -1344,7 +1340,6 @@ srpc_abort_rpc(struct srpc_client_rpc *rpc, int why)
        rpc->crpc_aborted = 1;
        rpc->crpc_status  = why;
        swi_schedule_workitem(&rpc->crpc_wi);
        rpc->crpc_aborted = 1;
        rpc->crpc_status  = why;
        swi_schedule_workitem(&rpc->crpc_wi);

-       return;

 }
 
 /* called with rpc->crpc_lock held */
 }
 
 /* called with rpc->crpc_lock held */


@@ -1360,7 +1355,6 @@ srpc_post_rpc(struct srpc_client_rpc *rpc)
 
        srpc_add_client_rpc_timer(rpc);
        swi_schedule_workitem(&rpc->crpc_wi);
 
        srpc_add_client_rpc_timer(rpc);
        swi_schedule_workitem(&rpc->crpc_wi);

-       return;

 }
 
 
 }
 
 


@@ -1694,6 +1688,4 @@ srpc_shutdown (void)
        case SRPC_STATE_NI_INIT:
                LNetNIFini();
        }
        case SRPC_STATE_NI_INIT:
                LNetNIFini();
        }

-
-       return;

 }
 }

diff --git a/lnet/selftest/selftest.h b/lnet/selftest/selftest.h
index ea1ee06..1a39cd7 100644 (file)
--- a/lnet/selftest/selftest.h
+++ b/lnet/selftest/selftest.h
@@ -511,8 +511,6 @@ srpc_destroy_client_rpc(struct srpc_client_rpc *rpc)
        } else {
                (*rpc->crpc_fini) (rpc);
        }
        } else {
                (*rpc->crpc_fini) (rpc);
        }

-
-       return;

 }
 
 static inline void
 }
 
 static inline void


@@ -551,7 +549,6 @@ srpc_init_client_rpc(struct srpc_client_rpc *rpc, struct lnet_process_id peer,
         rpc->crpc_reqstmsg.msg_magic   = SRPC_MSG_MAGIC;
         rpc->crpc_reqstmsg.msg_version = SRPC_MSG_VERSION;
         rpc->crpc_reqstmsg.msg_type    = srpc_service2request(service);
         rpc->crpc_reqstmsg.msg_magic   = SRPC_MSG_MAGIC;
         rpc->crpc_reqstmsg.msg_version = SRPC_MSG_VERSION;
         rpc->crpc_reqstmsg.msg_type    = srpc_service2request(service);

-        return;

 }
 
 static inline const char *
 }
 
 static inline const char *

diff --git a/lnet/utils/lst.c b/lnet/utils/lst.c
index 6c8aaea..36c6649 100644 (file)
--- a/lnet/utils/lst.c
+++ b/lnet/utils/lst.c
@@ -1641,8 +1641,6 @@ lst_timeval_diff(struct timeval *tv1,
 
        df->tv_sec  = tv1->tv_sec - 1 - tv2->tv_sec;
        df->tv_usec = tv1->tv_usec + 1000000 - tv2->tv_usec;
 
        df->tv_sec  = tv1->tv_sec - 1 - tv2->tv_sec;
        df->tv_usec = tv1->tv_usec + 1000000 - tv2->tv_usec;

-
-       return;

 }
 
 static void
 }
 
 static void

diff --git a/lustre/include/lustre_dlm.h b/lustre/include/lustre_dlm.h
index 6f6cf85..e0f1f9a 100644 (file)
--- a/lustre/include/lustre_dlm.h
+++ b/lustre/include/lustre_dlm.h
@@ -1616,8 +1616,6 @@ static inline void ldlm_svc_get_eopc(const struct ldlm_request *dlm_req,
 
        if (op != 0)
                lprocfs_counter_incr(srv_stats, op);
 
        if (op != 0)
                lprocfs_counter_incr(srv_stats, op);

-
-       return;

 }
 
 /* resource.c - internal */
 }
 
 /* resource.c - internal */

diff --git a/lustre/ldlm/ldlm_lock.c b/lustre/ldlm/ldlm_lock.c
index 4bde252..23d66da 100644 (file)
--- a/lustre/ldlm/ldlm_lock.c
+++ b/lustre/ldlm/ldlm_lock.c
@@ -1052,7 +1052,6 @@ static void search_granted_lock(struct list_head *queue,
         prev->mode_link = &req->l_sl_mode;
         prev->policy_link = &req->l_sl_policy;
         EXIT;
         prev->mode_link = &req->l_sl_mode;
         prev->policy_link = &req->l_sl_policy;
         EXIT;

-        return;

 }
 
 /**
 }
 
 /**

diff --git a/lustre/llite/rw.c b/lustre/llite/rw.c
index 28f921a..083caaa 100644 (file)
--- a/lustre/llite/rw.c
+++ b/lustre/llite/rw.c
@@ -809,7 +809,6 @@ static void ras_init_stride_detector(struct ll_readahead_state *ras,
        ras->ras_stride_length = stride_gap + ras->ras_consecutive_bytes;
 
         RAS_CDEBUG(ras);
        ras->ras_stride_length = stride_gap + ras->ras_consecutive_bytes;
 
         RAS_CDEBUG(ras);

-        return;

 }
 
 static unsigned long
 }
 
 static unsigned long


@@ -1060,7 +1059,6 @@ out_unlock:
        ras->ras_request_index++;
        ras->ras_last_read_end = pos + PAGE_SIZE - 1;
        spin_unlock(&ras->ras_lock);
        ras->ras_request_index++;
        ras->ras_last_read_end = pos + PAGE_SIZE - 1;
        spin_unlock(&ras->ras_lock);

-       return;

 }
 
 int ll_writepage(struct page *vmpage, struct writeback_control *wbc)
 }
 
 int ll_writepage(struct page *vmpage, struct writeback_control *wbc)

diff --git a/lustre/lov/lov_obd.c b/lustre/lov/lov_obd.c
index ac63489..8045378 100644 (file)
--- a/lustre/lov/lov_obd.c
+++ b/lustre/lov/lov_obd.c
@@ -65,7 +65,6 @@ void lov_tgts_getref(struct obd_device *obd)
        mutex_lock(&lov->lov_lock);
        atomic_inc(&lov->lov_refcount);
        mutex_unlock(&lov->lov_lock);
        mutex_lock(&lov->lov_lock);
        atomic_inc(&lov->lov_refcount);
        mutex_unlock(&lov->lov_lock);

-       return;

 }
 
 static void __lov_del_obd(struct obd_device *obd, struct lov_tgt_desc *tgt);
 }
 
 static void __lov_del_obd(struct obd_device *obd, struct lov_tgt_desc *tgt);

diff --git a/lustre/lov/lov_pool.c b/lustre/lov/lov_pool.c
index be35bd7..8f69478 100644 (file)
--- a/lustre/lov/lov_pool.c
+++ b/lustre/lov/lov_pool.c
@@ -244,7 +244,6 @@ static void pool_proc_stop(struct seq_file *s, void *v)
                 lov_pool_putref(iter->pool);
                 OBD_FREE_PTR(iter);
         }
                 lov_pool_putref(iter->pool);
                 OBD_FREE_PTR(iter);
         }

-        return;

 }
 
 static int pool_proc_show(struct seq_file *s, void *v)
 }
 
 static int pool_proc_show(struct seq_file *s, void *v)

diff --git a/lustre/mdt/mdt_hsm_cdt_actions.c b/lustre/mdt/mdt_hsm_cdt_actions.c
index cd2c247..e220134 100644 (file)
--- a/lustre/mdt/mdt_hsm_cdt_actions.c
+++ b/lustre/mdt/mdt_hsm_cdt_actions.c
@@ -618,7 +618,6 @@ static void mdt_hsm_actions_debugfs_stop(struct seq_file *s, void *v)
                llog_ctxt_put(aai->aai_ctxt);
 
        EXIT;
                llog_ctxt_put(aai->aai_ctxt);
 
        EXIT;

-       return;

 }
 
 static const struct seq_operations mdt_hsm_actions_debugfs_ops = {
 }
 
 static const struct seq_operations mdt_hsm_actions_debugfs_ops = {

diff --git a/lustre/mdt/mdt_recovery.c b/lustre/mdt/mdt_recovery.c
index cdb618e..770336a 100644 (file)
--- a/lustre/mdt/mdt_recovery.c
+++ b/lustre/mdt/mdt_recovery.c
@@ -219,7 +219,6 @@ void mdt_reconstruct_generic(struct mdt_thread_info *mti,
        struct ptlrpc_request *req = mdt_info_req(mti);
 
        mdt_req_from_lrd(req, mti->mti_reply_data);
        struct ptlrpc_request *req = mdt_info_req(mti);
 
        mdt_req_from_lrd(req, mti->mti_reply_data);

-       return;

 }
 
 /**
 }
 
 /**

diff --git a/lustre/obdclass/dt_object.c b/lustre/obdclass/dt_object.c
index 3bec5f7..ba8bfbf 100644 (file)
--- a/lustre/obdclass/dt_object.c
+++ b/lustre/obdclass/dt_object.c
@@ -537,7 +537,6 @@ void dt_version_set(const struct lu_env *env, struct dt_object *o,
        rc = dt_xattr_set(env, o, &vbuf, xname, 0, th);
        if (rc < 0)
                CDEBUG(D_INODE, "Can't set version, rc %d\n", rc);
        rc = dt_xattr_set(env, o, &vbuf, xname, 0, th);
        if (rc < 0)
                CDEBUG(D_INODE, "Can't set version, rc %d\n", rc);

-       return;

 }
 EXPORT_SYMBOL(dt_version_set);
 
 }
 EXPORT_SYMBOL(dt_version_set);
 

diff --git a/lustre/obdclass/genops.c b/lustre/obdclass/genops.c
index 729cdd0..bb8bc83 100644 (file)
--- a/lustre/obdclass/genops.c
+++ b/lustre/obdclass/genops.c
@@ -767,7 +767,6 @@ void class_obd_list(void)
                         atomic_read(&obd->obd_refcount));
         }
        read_unlock(&obd_dev_lock);
                         atomic_read(&obd->obd_refcount));
         }
        read_unlock(&obd_dev_lock);

-        return;

 }
 
 /* Search for a client OBD connected to tgt_uuid.  If grp_uuid is
 }
 
 /* Search for a client OBD connected to tgt_uuid.  If grp_uuid is

diff --git a/lustre/obdclass/llog_swab.c b/lustre/obdclass/llog_swab.c
index c644efb..3b35f42 100644 (file)
--- a/lustre/obdclass/llog_swab.c
+++ b/lustre/obdclass/llog_swab.c
@@ -414,7 +414,6 @@ void lustre_swab_lustre_cfg(struct lustre_cfg *lcfg)
 
        print_lustre_cfg(lcfg);
        EXIT;
 
        print_lustre_cfg(lcfg);
        EXIT;

-       return;

 }
 
 /* used only for compatibility with old on-disk cfg_marker data */
 }
 
 /* used only for compatibility with old on-disk cfg_marker data */


@@ -480,5 +479,4 @@ void lustre_swab_cfg_marker(struct cfg_marker *marker, int swab, int size)
        }
 
        EXIT;
        }
 
        EXIT;

-       return;

 }
 }

diff --git a/lustre/obdclass/local_storage.c b/lustre/obdclass/local_storage.c
index b27ef92..bbb8ada 100644 (file)
--- a/lustre/obdclass/local_storage.c
+++ b/lustre/obdclass/local_storage.c
@@ -719,7 +719,6 @@ void dt_los_put(struct local_oid_storage *los)
                /* should never happen, only local_oid_storage_fini should
                 * drop refcount to zero */
                LBUG();
                /* should never happen, only local_oid_storage_fini should
                 * drop refcount to zero */
                LBUG();

-       return;

 }
 
 /* after Lustre 2.3 release there may be old file to store last generated FID
 }
 
 /* after Lustre 2.3 release there may be old file to store last generated FID

diff --git a/lustre/obdclass/lprocfs_status_server.c b/lustre/obdclass/lprocfs_status_server.c
index 30e551f..d3da7d1 100644 (file)
--- a/lustre/obdclass/lprocfs_status_server.c
+++ b/lustre/obdclass/lprocfs_status_server.c
@@ -258,7 +258,6 @@ static void lprocfs_free_client_stats(struct nid_stat *client_stat)
                lprocfs_free_stats(&client_stat->nid_ldlm_stats);
 
        OBD_FREE_PTR(client_stat);
                lprocfs_free_stats(&client_stat->nid_ldlm_stats);
 
        OBD_FREE_PTR(client_stat);

-       return;

 }
 
 void lprocfs_free_per_client_stats(struct obd_device *obd)
 }
 
 void lprocfs_free_per_client_stats(struct obd_device *obd)

diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index 42c628e..1c4e26d 100644 (file)
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -1628,7 +1628,6 @@ static void dump_all_bulk_pages(struct obdo *oa, __u32 page_count,
        if (rc)
                CERROR("%s: sync returns %d\n", dbgcksum_file_name, rc);
        filp_close(filp, NULL);
        if (rc)
                CERROR("%s: sync returns %d\n", dbgcksum_file_name, rc);
        filp_close(filp, NULL);

-       return;

 }
 
 static int
 }
 
 static int

diff --git a/lustre/osd-ldiskfs/osd_quota.c b/lustre/osd-ldiskfs/osd_quota.c
index 03552be..c3a587d 100644 (file)
--- a/lustre/osd-ldiskfs/osd_quota.c
+++ b/lustre/osd-ldiskfs/osd_quota.c
@@ -511,8 +511,6 @@ void osd_quota_unpack(struct osd_object *obj, const struct dt_rec *rec)
        descr = obj->oo_dir->od_container.ic_descr;
 
        osd_quota_swab((char *)rec, descr->id_rec_size);
        descr = obj->oo_dir->od_container.ic_descr;
 
        osd_quota_swab((char *)rec, descr->id_rec_size);

-#else
-       return;

 #endif
 }
 
 #endif
 }
 

diff --git a/lustre/osd-zfs/osd_oi.c b/lustre/osd-zfs/osd_oi.c
index a2532c4..efcafe4 100644 (file)
--- a/lustre/osd-zfs/osd_oi.c
+++ b/lustre/osd-zfs/osd_oi.c
@@ -787,8 +787,6 @@ static void osd_ost_seq_fini(const struct lu_env *env, struct osd_device *osd)
                OBD_FREE(osd_seq, sizeof(*osd_seq));
        }
        write_unlock(&osl->osl_seq_list_lock);
                OBD_FREE(osd_seq, sizeof(*osd_seq));
        }
        write_unlock(&osl->osl_seq_list_lock);

-
-       return;

 }
 
 /**
 }
 
 /**

diff --git a/lustre/ptlrpc/gss/gss_keyring.c b/lustre/ptlrpc/gss/gss_keyring.c
index d744262..3d37bc6 100644 (file)
--- a/lustre/ptlrpc/gss/gss_keyring.c
+++ b/lustre/ptlrpc/gss/gss_keyring.c
@@ -1062,7 +1062,6 @@ void gss_sec_gc_ctx_kr(struct ptlrpc_sec *sec)
 
        dispose_ctx_list_kr(&freelist);
        EXIT;
 
        dispose_ctx_list_kr(&freelist);
        EXIT;

-       return;

 }
 
 static
 }
 
 static

diff --git a/lustre/ptlrpc/service.c b/lustre/ptlrpc/service.c
index eb6057e..5dd5e0c 100644 (file)
--- a/lustre/ptlrpc/service.c
+++ b/lustre/ptlrpc/service.c
@@ -1072,8 +1072,6 @@ void ptlrpc_request_change_export(struct ptlrpc_request *req,
        /* request takes one export refcount */
        req->rq_export = class_export_get(export);
        class_export_rpc_inc(export);
        /* request takes one export refcount */
        req->rq_export = class_export_get(export);
        class_export_rpc_inc(export);

-
-       return;

 }
 
 /**
 }
 
 /**

diff --git a/lustre/target/out_handler.c b/lustre/target/out_handler.c
index edb8906..c3efb6f 100644 (file)
--- a/lustre/target/out_handler.c
+++ b/lustre/target/out_handler.c
@@ -56,7 +56,6 @@ static void out_reconstruct(const struct lu_env *env, struct dt_device *dt,
               dt_obd_name(dt), reply, index, 0);
 
        object_update_result_insert(reply, NULL, 0, index, 0);
               dt_obd_name(dt), reply, index, 0);
 
        object_update_result_insert(reply, NULL, 0, index, 0);

-       return;

 }
 
 typedef void (*out_reconstruct_t)(const struct lu_env *env,
 }
 
 typedef void (*out_reconstruct_t)(const struct lu_env *env,

diff --git a/lustre/target/tgt_handler.c b/lustre/target/tgt_handler.c
index 05998d2..ca5eb97 100644 (file)
--- a/lustre/target/tgt_handler.c
+++ b/lustre/target/tgt_handler.c
@@ -1887,7 +1887,6 @@ static void dump_all_bulk_pages(struct obdo *oa, int count,
        if (rc)
                CERROR("%s: sync returns %d\n", dbgcksum_file_name, rc);
        filp_close(filp, NULL);
        if (rc)
                CERROR("%s: sync returns %d\n", dbgcksum_file_name, rc);
        filp_close(filp, NULL);

-       return;

 }
 
 static int check_read_checksum(struct niobuf_local *local_nb, int npages,
 }
 
 static int check_read_checksum(struct niobuf_local *local_nb, int npages,

diff --git a/lustre/utils/gss/gssd.c b/lustre/utils/gss/gssd.c
index a0f05e2..5f7bb40 100644 (file)
--- a/lustre/utils/gss/gssd.c
+++ b/lustre/utils/gss/gssd.c
@@ -169,7 +169,6 @@ sig_hup(int signal)
 {
        /* don't exit on SIGHUP */
        printerr(1, "Received SIGHUP... Ignoring.\n");
 {
        /* don't exit on SIGHUP */
        printerr(1, "Received SIGHUP... Ignoring.\n");

-       return;

 }
 
 static void
 }
 
 static void

diff --git a/lustre/utils/gss/gssd_main_loop.c b/lustre/utils/gss/gssd_main_loop.c
index 70c70c6..bb20538 100644 (file)
--- a/lustre/utils/gss/gssd_main_loop.c
+++ b/lustre/utils/gss/gssd_main_loop.c
@@ -163,5 +163,4 @@ lgssd_run()
        }
 out:
        close(fd);
        }
 out:
        close(fd);

-       return;

 }
 }

diff --git a/lustre/utils/gss/gssd_proc.c b/lustre/utils/gss/gssd_proc.c
index 65df741..9d3f3e9 100644 (file)
--- a/lustre/utils/gss/gssd_proc.c
+++ b/lustre/utils/gss/gssd_proc.c
@@ -244,7 +244,6 @@ fail_keep_client:
        /* We couldn't find some subdirectories, but we keep the client
         * around in case we get a notification on the directory when the
         * subdirectories are created. */
        /* We couldn't find some subdirectories, but we keep the client
         * around in case we get a notification on the directory when the
         * subdirectories are created. */

-       return;

 }
 
 void
 }
 
 void

diff --git a/lustre/utils/gss/lgss_sk_utils.c b/lustre/utils/gss/lgss_sk_utils.c
index b6f1fd8..04133f1 100644 (file)
--- a/lustre/utils/gss/lgss_sk_utils.c
+++ b/lustre/utils/gss/lgss_sk_utils.c
@@ -76,7 +76,6 @@ static void lgss_sk_release_cred(struct lgss_cred *cred)
        sk_free_cred(skc);
        cred->lc_mech_cred = NULL;
        free(cred->lc_mech_token.value);
        sk_free_cred(skc);
        cred->lc_mech_cred = NULL;
        free(cred->lc_mech_token.value);

-       return;

 }
 
 /**
 }
 
 /**

diff --git a/lustre/utils/gss/sk_utils.c b/lustre/utils/gss/sk_utils.c
index eca33ba..f20a4ab 100644 (file)
--- a/lustre/utils/gss/sk_utils.c
+++ b/lustre/utils/gss/sk_utils.c
@@ -301,8 +301,6 @@ void sk_config_cpu_to_disk(struct sk_keyfile_config *config)
 
        for (i = 0; i < MAX_MGSNIDS; i++)
                config->skc_mgsnids[i] = htobe64(config->skc_mgsnids[i]);
 
        for (i = 0; i < MAX_MGSNIDS; i++)
                config->skc_mgsnids[i] = htobe64(config->skc_mgsnids[i]);

-
-       return;

 }
 
 /**
 }
 
 /**


@@ -326,8 +324,6 @@ void sk_config_disk_to_cpu(struct sk_keyfile_config *config)
 
        for (i = 0; i < MAX_MGSNIDS; i++)
                config->skc_mgsnids[i] = be64toh(config->skc_mgsnids[i]);
 
        for (i = 0; i < MAX_MGSNIDS; i++)
                config->skc_mgsnids[i] = be64toh(config->skc_mgsnids[i]);

-
-       return;

 }
 
 /**
 }
 
 /**

diff --git a/lustre/utils/gss/svcgssd.c b/lustre/utils/gss/svcgssd.c
index f91e6af..ab4c462 100644 (file)
--- a/lustre/utils/gss/svcgssd.c
+++ b/lustre/utils/gss/svcgssd.c
@@ -147,8 +147,6 @@ mydaemon(int nochdir, int noclose)
                dup2(tempfd, 2);
                closeall(3);
        }
                dup2(tempfd, 2);
                closeall(3);
        }

-
-       return;

 }
 
 static void
 }
 
 static void


@@ -178,7 +176,6 @@ sig_hup(int signal)
 {
        /* don't exit on SIGHUP */
        printerr(1, "Received SIGHUP... Ignoring.\n");
 {
        /* don't exit on SIGHUP */
        printerr(1, "Received SIGHUP... Ignoring.\n");

-       return;

 }
 
 static void
 }
 
 static void

diff --git a/lustre/utils/liblustreapi_hsm.c b/lustre/utils/liblustreapi_hsm.c
index 38e0fba..8d9938b 100644 (file)
--- a/lustre/utils/liblustreapi_hsm.c
+++ b/lustre/utils/liblustreapi_hsm.c
@@ -657,8 +657,6 @@ err:
 out_free:
        if (json_items != NULL)
                llapi_json_destroy_list(&json_items);
 out_free:
        if (json_items != NULL)
                llapi_json_destroy_list(&json_items);

-
-       return;

 }
 
 /** Register a copytool
 }
 
 /** Register a copytool

diff --git a/lustre/utils/llog_reader.c b/lustre/utils/llog_reader.c
index 6c776e2..f498b54 100644 (file)
--- a/lustre/utils/llog_reader.c
+++ b/lustre/utils/llog_reader.c
@@ -356,7 +356,6 @@ void llog_unpack_buffer(int fd, struct llog_log_hdr *llog_buf,
                free(llog_buf);
        if (recs_buf != NULL)
                free(recs_buf);
                free(llog_buf);
        if (recs_buf != NULL)
                free(recs_buf);

-       return;

 }
 
 void print_llog_header(struct llog_log_hdr *llog_buf)
 }
 
 void print_llog_header(struct llog_log_hdr *llog_buf)


@@ -378,7 +377,6 @@ void print_llog_header(struct llog_log_hdr *llog_buf)
        /* Add the other info you want to view here */
 
        printf("-----------------------\n");
        /* Add the other info you want to view here */
 
        printf("-----------------------\n");

-       return;

 }
 
 static void print_1_cfg(struct lustre_cfg *lcfg)
 }
 
 static void print_1_cfg(struct lustre_cfg *lcfg)


@@ -393,7 +391,6 @@ static void print_1_cfg(struct lustre_cfg *lcfg)
         for (i = 0; i <  lcfg->lcfg_bufcount; i++)
                 printf("%d:%.*s  ", i, lcfg->lcfg_buflens[i],
                        (char*)lustre_cfg_buf(lcfg, i));
         for (i = 0; i <  lcfg->lcfg_bufcount; i++)
                 printf("%d:%.*s  ", i, lcfg->lcfg_buflens[i],
                        (char*)lustre_cfg_buf(lcfg, i));

-        return;

 }
 
 static char *lustre_cfg_string(struct lustre_cfg *lcfg, __u32 index)
 }
 
 static char *lustre_cfg_string(struct lustre_cfg *lcfg, __u32 index)


@@ -449,8 +446,6 @@ static void print_setup_cfg(struct lustre_cfg *lcfg)
                 printf("setup     ");
                 print_1_cfg(lcfg);
         }
                 printf("setup     ");
                 print_1_cfg(lcfg);
         }

-
-        return;

 }
 
 void print_lustre_cfg(struct lustre_cfg *lcfg, int *skip)
 }
 
 void print_lustre_cfg(struct lustre_cfg *lcfg, int *skip)


@@ -638,7 +633,6 @@ void print_lustre_cfg(struct lustre_cfg *lcfg, int *skip)
                 printf("unsupported cmd_code = %x\n",cmd);
         }
         printf("\n");
                 printf("unsupported cmd_code = %x\n",cmd);
         }
         printf("\n");

-        return;

 }
 
 static void print_hsm_action(struct llog_agent_req_rec *larr)
 }
 
 static void print_hsm_action(struct llog_agent_req_rec *larr)

diff --git a/lustre/utils/lustre_rsync.c b/lustre/utils/lustre_rsync.c
index 550ffdd..1b7b52f 100644 (file)
--- a/lustre/utils/lustre_rsync.c
+++ b/lustre/utils/lustre_rsync.c
@@ -545,7 +545,6 @@ void lr_get_FID_PATH(char *mntpt, char *fidstr, char *buf, int bufsize)
         /* Open-by-FID path is <mntpt>/.lustre/fid/[SEQ:OID:VER] */
         snprintf(buf, bufsize, "%s/%s/fid/%s", mntpt, dot_lustre_name,
                  fidstr);
         /* Open-by-FID path is <mntpt>/.lustre/fid/[SEQ:OID:VER] */
         snprintf(buf, bufsize, "%s/%s/fid/%s", mntpt, dot_lustre_name,
                  fidstr);

-        return;

 }
 
 /* Read the symlink information into 'info->link' */
 }
 
 /* Read the symlink information into 'info->link' */


@@ -1260,8 +1259,6 @@ void lr_backup_log()
        snprintf(backupfile, sizeof(backupfile), "%s.old", statuslog);
         (void) rename(statuslog, backupfile);
         logbackedup = 1;
        snprintf(backupfile, sizeof(backupfile), "%s.old", statuslog);
         (void) rename(statuslog, backupfile);
         logbackedup = 1;

-
-        return;

 }
 
 /* Save replication parameters to a statuslog. */
 }
 
 /* Save replication parameters to a statuslog. */

diff --git a/lustre/utils/mkfs_lustre.c b/lustre/utils/mkfs_lustre.c
index a054cf6..2ae81d3 100644 (file)
--- a/lustre/utils/mkfs_lustre.c
+++ b/lustre/utils/mkfs_lustre.c
@@ -168,7 +168,6 @@ void usage(FILE *out)
                "\t\t\texit\n"
                "\t\t--quiet\n",
                (int)sizeof(((struct lustre_disk_data *)0)->ldd_userdata));
                "\t\t\texit\n"
                "\t\t--quiet\n",
                (int)sizeof(((struct lustre_disk_data *)0)->ldd_userdata));

-       return;

 }
 
 /* ==================== Lustre config functions =============*/
 }
 
 /* ==================== Lustre config functions =============*/

diff --git a/lustre/utils/obd.c b/lustre/utils/obd.c
index f3294ff..15ff456 100644 (file)
--- a/lustre/utils/obd.c
+++ b/lustre/utils/obd.c
@@ -484,8 +484,6 @@ static void shmem_total(int total_threads)
 
        printf("Total: total %ju threads %d sec %f %f/second\n",
               (uintmax_t)total, total_threads, secs, total / secs);
 
        printf("Total: total %ju threads %d sec %f %f/second\n",
               (uintmax_t)total, total_threads, secs, total / secs);

-
-        return;

 }
 
 static void shmem_snap(int total_threads, int live_threads)
 }
 
 static void shmem_snap(int total_threads, int live_threads)

diff --git a/snmp/lustre-snmp-util.c b/snmp/lustre-snmp-util.c
index fbbe8f6..4482f70 100644 (file)
--- a/snmp/lustre-snmp-util.c
+++ b/snmp/lustre-snmp-util.c
@@ -271,7 +271,6 @@ void lustrefs_ctrl(int command)
         execvp(cmd[0], cmd);
         report("failed to execvp(\'%s %s\')",cmd[0],cmd[1]);
     }
         execvp(cmd[0], cmd);
         report("failed to execvp(\'%s %s\')",cmd[0],cmd[1]);
     }

-    return;

 }
 
 /*****************************************************************************
 }
 
 /*****************************************************************************


@@ -416,7 +415,6 @@ void report(const char *fmt, ...)
 
     DEBUGMSGTL(("lsnmpd", "%s\n", buf));
     fprintf(stderr, "%s\n", buf);
 
     DEBUGMSGTL(("lsnmpd", "%s\n", buf));
     fprintf(stderr, "%s\n", buf);

-    return;

 }
 
 
 }