summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
a88d0aa)
Convert whitespace to tabs where appropriate in kiblnd_startup()
Cray-bug-id: LUS-7935
Test-Parameters: trivial
Signed-off-by: Chris Horn <hornc@cray.com>
Change-Id: I11aaaa8e47d754b219fb773d74e37190476e4eeb
Reviewed-on: https://review.whamcloud.com/36324
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Shaun Tancheff <stancheff@cray.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Neil Brown <neilb@suse.de>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
static int
kiblnd_startup(struct lnet_ni *ni)
{
static int
kiblnd_startup(struct lnet_ni *ni)
{
struct lnet_inetdev *ifaces = NULL;
struct kib_dev *ibdev = NULL;
struct kib_net *net;
struct lnet_inetdev *ifaces = NULL;
struct kib_dev *ibdev = NULL;
struct kib_net *net;
- unsigned long flags;
- int rc;
+ unsigned long flags;
+ int rc;
- 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);
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;
net->ibn_incarnation = ktime_get_real_ns() / NSEC_PER_USEC;
ifname = *kiblnd_tunables.kib_default_ipif;
}
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)
rc = lnet_inet_enumerate(&ifaces, ni->ni_net_ns);
if (rc < 0)
goto failed;
rc = kiblnd_net_init_pools(net, ni, ni->ni_cpts, ni->ni_ncpts);
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);
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;
failed:
if (net != NULL && net->ibn_dev == NULL && ibdev != NULL)
failed:
if (net != NULL && net->ibn_dev == NULL && ibdev != NULL)
- kiblnd_destroy_dev(ibdev);
+ kiblnd_destroy_dev(ibdev);
- CDEBUG(D_NET, "kiblnd_startup failed\n");
- return -ENETDOWN;
+ CDEBUG(D_NET, "kiblnd_startup failed\n");
+ return -ENETDOWN;
}
static struct lnet_lnd the_o2iblnd = {
}
static struct lnet_lnd the_o2iblnd = {