From 50300e83e4cab3157149107eb735825cc4c3aff1 Mon Sep 17 00:00:00 2001 From: Chris Horn Date: Mon, 30 Sep 2019 10:01:28 -0500 Subject: [PATCH 1/1] LU-12824 o2ib: Fix whitespace in kiblnd_startup Convert whitespace to tabs where appropriate in kiblnd_startup() Cray-bug-id: LUS-7935 Test-Parameters: trivial Signed-off-by: Chris Horn Change-Id: I11aaaa8e47d754b219fb773d74e37190476e4eeb Reviewed-on: https://review.whamcloud.com/36324 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Shaun Tancheff Reviewed-by: James Simmons Reviewed-by: Neil Brown Reviewed-by: Oleg Drokin --- lnet/klnds/o2iblnd/o2iblnd.c | 52 ++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/lnet/klnds/o2iblnd/o2iblnd.c b/lnet/klnds/o2iblnd/o2iblnd.c index 0d7b50a..11a39f5 100644 --- a/lnet/klnds/o2iblnd/o2iblnd.c +++ b/lnet/klnds/o2iblnd/o2iblnd.c @@ -3192,26 +3192,26 @@ static int kiblnd_dev_start_threads(struct kib_dev *dev, u32 *cpts, int ncpts) static int kiblnd_startup(struct lnet_ni *ni) { - char *ifname; + char *ifname; struct lnet_inetdev *ifaces = NULL; struct kib_dev *ibdev = NULL; struct kib_net *net; - unsigned long flags; - int rc; + unsigned long flags; + int rc; int i; - LASSERT (ni->ni_net->net_lnd == &the_o2iblnd); + LASSERT(ni->ni_net->net_lnd == &the_o2iblnd); - if (kiblnd_data.kib_init == IBLND_INIT_NOTHING) { + if (kiblnd_data.kib_init == IBLND_INIT_NOTHING) { rc = kiblnd_base_startup(ni->ni_net_ns); - if (rc != 0) - return rc; - } + if (rc != 0) + return rc; + } - LIBCFS_ALLOC(net, sizeof(*net)); - ni->ni_data = net; - if (net == NULL) - goto failed; + LIBCFS_ALLOC(net, sizeof(*net)); + ni->ni_data = net; + if (net == NULL) + goto failed; net->ibn_incarnation = ktime_get_real_ns() / NSEC_PER_USEC; @@ -3234,10 +3234,10 @@ kiblnd_startup(struct lnet_ni *ni) ifname = *kiblnd_tunables.kib_default_ipif; } - if (strlen(ifname) >= sizeof(ibdev->ibd_ifname)) { - CERROR("IPoIB interface name too long: %s\n", ifname); - goto failed; - } + if (strlen(ifname) >= sizeof(ibdev->ibd_ifname)) { + CERROR("IPoIB interface name too long: %s\n", ifname); + goto failed; + } rc = lnet_inet_enumerate(&ifaces, ni->ni_net_ns); if (rc < 0) @@ -3288,29 +3288,29 @@ kiblnd_startup(struct lnet_ni *ni) goto failed; rc = kiblnd_net_init_pools(net, ni, ni->ni_cpts, ni->ni_ncpts); - if (rc != 0) { - CERROR("Failed to initialize NI pools: %d\n", rc); - goto failed; - } + if (rc != 0) { + CERROR("Failed to initialize NI pools: %d\n", rc); + goto failed; + } write_lock_irqsave(&kiblnd_data.kib_global_lock, flags); ibdev->ibd_nnets++; list_add_tail(&net->ibn_list, &ibdev->ibd_nets); write_unlock_irqrestore(&kiblnd_data.kib_global_lock, flags); - net->ibn_init = IBLND_INIT_ALL; + net->ibn_init = IBLND_INIT_ALL; - return 0; + return 0; failed: if (net != NULL && net->ibn_dev == NULL && ibdev != NULL) - kiblnd_destroy_dev(ibdev); + kiblnd_destroy_dev(ibdev); kfree(ifaces); - kiblnd_shutdown(ni); + kiblnd_shutdown(ni); - CDEBUG(D_NET, "kiblnd_startup failed\n"); - return -ENETDOWN; + CDEBUG(D_NET, "kiblnd_startup failed\n"); + return -ENETDOWN; } static struct lnet_lnd the_o2iblnd = { -- 1.8.3.1