libtcmu: allow multiple daemons co-exist

As we support libtcmu again users could want to run several daemons at the same time. So don't fail the device addition via netlink reply when can't find a handler in ctx to handle the device. This just means the device addition event is not for this ctx so give other daemons a chance to try. Signed-off-by: Yaowei Bai <[email protected]>
open-iscsi · Dec 25, 2018 · 5853939 · 5853939
1 parent 98fa105
commit 5853939
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/libtcmu.c b/libtcmu.c
@@ -212,6 +212,8 @@ static int handle_netlink(struct nl_cache_ops *unused, struct genl_cmd *cmd,
  ret = add_device(ctx, buf,
  nla_get_string(info->attrs[TCMU_ATTR_DEVICE]),
  false);
+ if (ret == 1)
+ return 0;
  break;
  case TCMU_CMD_REMOVED_DEVICE:
  reply_cmd = TCMU_CMD_REMOVED_DEVICE_DONE;
@@ -432,8 +434,8 @@ static int add_device(struct tcmulib_context *ctx, char *dev_name,
 
  dev->handler = find_handler(ctx, dev->cfgstring);
  if (!dev->handler) {
- tcmu_err("could not find handler for %s\n", dev->dev_name);
- goto err_free;
+ tcmu_dbg("could not find handler for %s\n", dev->dev_name);
+ goto err_nohandler;
  }
 
  if (dev->handler->check_config &&
@@ -536,8 +538,11 @@ static int add_device(struct tcmulib_context *ctx, char *dev_name,
  tcmu_cfgfs_dev_exec_action(dev, "block_dev", 0);
 err_free:
  free(dev);
-
  return -ENOENT;
+err_nohandler:
+ free(dev);
+
+ return 1;
 }
 
 static void close_devices(struct tcmulib_context *ctx)