[PATCH 29/40] staging: lustre: handle lnet_check_routes() errors
James Simmons
jsimmons at infradead.org
Fri Nov 20 23:36:05 UTC 2015
From: Amir Shehata <amir.shehata at intel.com>
After adding a route, lnet_check_routes() is called to ensure that
the route added doesn't invalidate the routing configuration. If
lnet_check_routes() fails then the route just added, which caused the
current configuration to be invalidated is deleted, and an error
is returned to the user.
Signed-off-by: Amir Shehata <amir.shehata at intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6218
Reviewed-on: http://review.whamcloud.com/13445
Reviewed-by: Liang Zhen <liang.zhen at intel.com>
Reviewed-by: Doug Oucharek <doug.s.oucharek at intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin at intel.com>
---
drivers/staging/lustre/lnet/lnet/api-ni.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/drivers/staging/lustre/lnet/lnet/api-ni.c b/drivers/staging/lustre/lnet/lnet/api-ni.c
index ed167c8..b119c6c 100644
--- a/drivers/staging/lustre/lnet/lnet/api-ni.c
+++ b/drivers/staging/lustre/lnet/lnet/api-ni.c
@@ -1910,8 +1910,14 @@ LNetCtl(unsigned int cmd, void *arg)
config->cfg_nid,
config->cfg_config_u.cfg_route.
rtr_priority);
+ if (rc == 0) {
+ rc = lnet_check_routes();
+ if (rc != 0)
+ lnet_del_route(config->cfg_net,
+ config->cfg_nid);
+ }
mutex_unlock(&the_lnet.ln_api_mutex);
- return (rc != 0) ? rc : lnet_check_routes();
+ return rc;
case IOC_LIBCFS_DEL_ROUTE:
config = arg;
--
1.7.1
More information about the devel
mailing list