Mercurial > nomad > experimental

changeset 619:221eebdf3352

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
objstore: prepare generic vdev import code for automatic vol import Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
author Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
date Sun, 02 Dec 2018 10:23:58 -0500
parents 62cb9de73005
children 0801a8d7fa66
files src/objstore/vdev.c
diffstat 1 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/objstore/vdev.c	Sat Nov 17 22:23:50 2018 -0500
+++ b/src/objstore/vdev.c	Sun Dec 02 10:23:58 2018 -0500
@@ -109,7 +109,6 @@
 struct objstore_vdev *objstore_vdev_import(const char *type, const char *path,
 					   bool create)
 {
-	int (*fxn)(struct objstore_vdev *vdev);
 	struct objstore_vdev *vdev;
 	struct objstore_vdev *prev;
 	int ret;
@@ -119,14 +118,13 @@
 		return vdev;
 
 	if (create) {
-		fxn = vdev->def->create_vdev;
 		xuuid_generate(&vdev->uuid);
+		ret = vdev->def->create_vdev(vdev);
 	} else {
-		fxn = vdev->def->import_vdev;
 		xuuid_clear(&vdev->uuid);
+		ret = vdev->def->import_vdev(vdev);
 	}
 
-	ret = fxn(vdev);
 	if (ret)
 		goto err;