X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fmount_utils.c;h=7383f2126c4e8f3e0b26e29de5ba0171350d2c88;hb=62a9ad817017d677b1914f0838d4a66ce64d2270;hp=31cec4abca8fa6c956293edc5be0ccfe59994c6a;hpb=11317196203c26f8c9e4d2a8261859b1c7a76c9d;p=fs%2Flustre-release.git

diff --git a/lustre/utils/mount_utils.c b/lustre/utils/mount_utils.c
index 31cec4a..7383f21 100644
--- a/lustre/utils/mount_utils.c
+++ b/lustre/utils/mount_utils.c
@@ -38,14 +38,18 @@
 #endif /* HAVE_CONFIG_H */
 
 #include "mount_utils.h"
+#include <mntent.h>
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
 #include <config.h>
 #include <lustre_disk.h>
 #include <lustre_ver.h>
+#include <sys/mount.h>
 #include <sys/stat.h>
 #include <sys/utsname.h>
+#include <linux/loop.h>
+#include <dlfcn.h>
 
 extern char *progname;
 extern int verbose;
@@ -53,6 +57,8 @@ extern int verbose;
 #define vprint(fmt, arg...) if (verbose > 0) printf(fmt, ##arg)
 #define verrprint(fmt, arg...) if (verbose >= 0) fprintf(stderr, fmt, ##arg)
 
+static struct module_backfs_ops *backfs_ops[LDD_MT_LAST];
+
 void fatal(void)
 {
         verbose = 0;
@@ -140,6 +146,43 @@ int get_param(char *buf, char *key, char **val)
 	return ENOENT;
 }
 
+int append_param(char *buf, char *key, char *val, char sep)
+{
+	int key_len, i, offset, old_val_len;
+	char *ptr = NULL, str[1024];
+
+	if (key)
+		ptr = strstr(buf, key);
+
+	/* key doesn't exist yet, so just add it */
+	if (ptr == NULL)
+		return add_param(buf, key, val);
+
+	key_len = strlen(key);
+
+	/* Copy previous values to str */
+	for (i = 0; i < sizeof(str); ++i) {
+		if ((ptr[i+key_len] == ' ') || (ptr[i+key_len] == '\0'))
+			break;
+		str[i] = ptr[i+key_len];
+	}
+	if (i == sizeof(str))
+		return E2BIG;
+	old_val_len = i;
+
+	offset = old_val_len+key_len;
+
+	/* Move rest of buf to overwrite previous key and value */
+	for (i = 0; ptr[i+offset] != '\0'; ++i)
+		ptr[i] = ptr[i+offset];
+
+	ptr[i] = '\0';
+
+	snprintf(str+old_val_len, sizeof(str)-old_val_len, "%c%s", sep, val);
+
+	return add_param(buf, key, str);
+}
+
 char *strscat(char *dst, char *src, int buflen)
 {
 	dst[buflen - 1] = 0;
@@ -307,7 +350,8 @@ int loop_setup(struct mkfs_opts *mop)
 	int i, ret = 0;
 
 	/* Figure out the loop device names */
-	if (!access("/dev/loop0", F_OK | R_OK)) {
+	if (!access("/dev/loop0", F_OK | R_OK) ||
+	    !access("/dev/loop-control", F_OK | R_OK)) {
 		strcpy(loop_base, "/dev/loop\0");
 	} else if (!access("/dev/loop/0", F_OK | R_OK)) {
 		strcpy(loop_base, "/dev/loop/\0");
@@ -321,9 +365,24 @@ int loop_setup(struct mkfs_opts *mop)
 		char cmd[PATH_MAX];
 		int cmdsz = sizeof(cmd);
 
+#ifdef LOOP_CTL_GET_FREE
+		ret = open("/dev/loop-control", O_RDWR);
+		if (ret < 0) {
+			fprintf(stderr, "%s: can't access loop control\n", progname);
+			return EACCES;
+		}
+		/* find or allocate a free loop device to use */
+		i = ioctl(ret, LOOP_CTL_GET_FREE);
+		if (i < 0) {
+			fprintf(stderr, "%s: access loop control error\n", progname);
+			return EACCES;
+		}
+		sprintf(l_device, "%s%d", loop_base, i);
+#else
 		sprintf(l_device, "%s%d", loop_base, i);
 		if (access(l_device, F_OK | R_OK))
 			break;
+#endif
 		snprintf(cmd, cmdsz, "losetup %s > /dev/null 2>&1", l_device);
 		ret = system(cmd);
 
@@ -407,31 +466,129 @@ int loop_format(struct mkfs_opts *mop)
 	return 0;
 }
 
+#define DLSYM(prefix, sym, func)					\
+	do {								\
+		char _fname[64];					\
+		snprintf(_fname, sizeof(_fname), "%s_%s", prefix, #func); \
+		sym->func = (typeof(sym->func))dlsym(sym->dl_handle, _fname); \
+	} while (0)
+
+/**
+ * Load plugin for a given mount_type from ${pkglibdir}/mount_osd_FSTYPE.so and
+ * return struct of function pointers (will be freed in unloack_backfs_module).
+ *
+ * \param[in] mount_type	Mount type to load module for.
+ * \retval Value of backfs_ops struct
+ * \retval NULL if no module exists
+ */
+struct module_backfs_ops *load_backfs_module(enum ldd_mount_type mount_type)
+{
+	void *handle;
+	char *error, filename[512], fsname[512], *name;
+	struct module_backfs_ops *ops;
+
+	/* This deals with duplicate ldd_mount_types resolving to same OSD layer
+	 * plugin (e.g. ext3/ldiskfs/ldiskfs2 all being ldiskfs) */
+	strlcpy(fsname, mt_type(mount_type), sizeof(fsname));
+	name = fsname + sizeof("osd-") - 1;
+
+	/* change osd- to osd_ */
+	fsname[sizeof("osd-") - 2] = '_';
+
+	snprintf(filename, sizeof(filename), PLUGIN_DIR"/mount_%s.so", fsname);
+
+	handle = dlopen(filename, RTLD_LAZY);
+
+	/* Check for $LUSTRE environment variable from test-framework.
+	 * This allows using locally built modules to be used.
+	 */
+	if (handle == NULL) {
+		char *dirname;
+		dirname = getenv("LUSTRE");
+		if (dirname) {
+			snprintf(filename, sizeof(filename),
+				 "%s/utils/.libs/mount_%s.so",
+				 dirname, fsname);
+			handle = dlopen(filename, RTLD_LAZY);
+		}
+	}
+
+	/* Do not clutter up console with missing types */
+	if (handle == NULL)
+		return NULL;
+
+	ops = malloc(sizeof(*ops));
+	if (ops == NULL) {
+		dlclose(handle);
+		return NULL;
+	}
+
+	ops->dl_handle = handle;
+	dlerror(); /* Clear any existing error */
+
+	DLSYM(name, ops, init);
+	DLSYM(name, ops, fini);
+	DLSYM(name, ops, read_ldd);
+	DLSYM(name, ops, write_ldd);
+	DLSYM(name, ops, is_lustre);
+	DLSYM(name, ops, make_lustre);
+	DLSYM(name, ops, prepare_lustre);
+	DLSYM(name, ops, tune_lustre);
+	DLSYM(name, ops, label_lustre);
+	DLSYM(name, ops, enable_quota);
+
+	error = dlerror();
+	if (error != NULL) {
+		fatal();
+		fprintf(stderr, "%s\n", error);
+		dlclose(handle);
+		free(ops);
+		return NULL;
+	}
+	return ops;
+}
+
+/**
+ * Unload plugin and free backfs_ops structure. Must be called the same number
+ * of times as load_backfs_module is.
+ */
+void unload_backfs_module(struct module_backfs_ops *ops)
+{
+	if (ops == NULL)
+		return;
+
+	dlclose(ops->dl_handle);
+	free(ops);
+}
+
+/* Return true if backfs_ops has operations for the given mount_type. */
+int backfs_mount_type_okay(enum ldd_mount_type mount_type)
+{
+	if (unlikely(mount_type >= LDD_MT_LAST || mount_type < 0)) {
+		fatal();
+		fprintf(stderr, "fs type out of range %d\n", mount_type);
+		return 0;
+	}
+	if (backfs_ops[mount_type] == NULL) {
+		fatal();
+		fprintf(stderr, "unhandled fs type %d '%s'\n",
+			mount_type, mt_str(mount_type));
+		return 0;
+	}
+	return 1;
+}
+
 /* Write the server config files */
 int osd_write_ldd(struct mkfs_opts *mop)
 {
 	struct lustre_disk_data *ldd = &mop->mo_ldd;
 	int ret;
 
-	switch (ldd->ldd_mount_type) {
-#ifdef HAVE_LDISKFS_OSD
-	case LDD_MT_LDISKFS:
-	case LDD_MT_LDISKFS2:
-		ret = ldiskfs_write_ldd(mop);
-		break;
-#endif /* HAVE_LDISKFS_OSD */
-#ifdef HAVE_ZFS_OSD
-	case LDD_MT_ZFS:
-		ret = zfs_write_ldd(mop);
-		break;
-#endif /* HAVE_ZFS_OSD */
-	default:
-		fatal();
-		fprintf(stderr, "unknown fs type %d '%s'\n",
-			ldd->ldd_mount_type, MT_STR(ldd));
+	if (backfs_mount_type_okay(ldd->ldd_mount_type))
+		ret = backfs_ops[ldd->ldd_mount_type]->write_ldd(mop);
+
+	else
 		ret = EINVAL;
-		break;
-	}
 
 	return ret;
 }
@@ -441,25 +598,11 @@ int osd_read_ldd(char *dev, struct lustre_disk_data *ldd)
 {
 	int ret;
 
-	switch (ldd->ldd_mount_type) {
-#ifdef HAVE_LDISKFS_OSD
-	case LDD_MT_LDISKFS:
-	case LDD_MT_LDISKFS2:
-		ret = ldiskfs_read_ldd(dev, ldd);
-		break;
-#endif /* HAVE_LDISKFS_OSD */
-#ifdef HAVE_ZFS_OSD
-	case LDD_MT_ZFS:
-		ret = zfs_read_ldd(dev, ldd);
-		break;
-#endif /* HAVE_ZFS_OSD */
-	default:
-		fatal();
-		fprintf(stderr, "unknown fs type %d '%s'\n",
-			ldd->ldd_mount_type, MT_STR(ldd));
+	if (backfs_mount_type_okay(ldd->ldd_mount_type))
+		ret = backfs_ops[ldd->ldd_mount_type]->read_ldd(dev, ldd);
+
+	else
 		ret = EINVAL;
-		break;
-	}
 
 	return ret;
 }
@@ -467,20 +610,17 @@ int osd_read_ldd(char *dev, struct lustre_disk_data *ldd)
 /* Was this device formatted for Lustre */
 int osd_is_lustre(char *dev, unsigned *mount_type)
 {
+	int i;
+
 	vprint("checking for existing Lustre data: ");
 
-#ifdef HAVE_LDISKFS_OSD
-	if (ldiskfs_is_lustre(dev, mount_type)) {
-		vprint("found\n");
-		return 1;
-	}
-#endif /* HAVE_LDISKFS_OSD */
-#ifdef HAVE_ZFS_OSD
-	if (zfs_is_lustre(dev, mount_type)) {
-		vprint("found\n");
-		return 1;
+	for (i = 0; i < LDD_MT_LAST; ++i) {
+		if (backfs_ops[i] != NULL &&
+		    backfs_ops[i]->is_lustre(dev, mount_type)) {
+			vprint("found\n");
+			return 1;
+		}
 	}
-#endif /* HAVE_ZFS_OSD */
 
 	vprint("not found\n");
 	return 0;
@@ -492,25 +632,11 @@ int osd_make_lustre(struct mkfs_opts *mop)
 	struct lustre_disk_data *ldd = &mop->mo_ldd;
 	int ret;
 
-	switch (ldd->ldd_mount_type) {
-#ifdef HAVE_LDISKFS_OSD
-	case LDD_MT_LDISKFS:
-	case LDD_MT_LDISKFS2:
-		ret = ldiskfs_make_lustre(mop);
-		break;
-#endif /* HAVE_LDISKFS_OSD */
-#ifdef HAVE_ZFS_OSD
-	case LDD_MT_ZFS:
-		ret = zfs_make_lustre(mop);
-		break;
-#endif /* HAVE_ZFS_OSD */
-	default:
-		fatal();
-		fprintf(stderr, "unknown fs type %d '%s'\n",
-			ldd->ldd_mount_type, MT_STR(ldd));
+	if (backfs_mount_type_okay(ldd->ldd_mount_type))
+		ret = backfs_ops[ldd->ldd_mount_type]->make_lustre(mop);
+
+	else
 		ret = EINVAL;
-		break;
-	}
 
 	return ret;
 }
@@ -522,29 +648,13 @@ int osd_prepare_lustre(struct mkfs_opts *mop,
 	struct lustre_disk_data *ldd = &mop->mo_ldd;
 	int ret;
 
-	switch (ldd->ldd_mount_type) {
-#ifdef HAVE_LDISKFS_OSD
-	case LDD_MT_LDISKFS:
-	case LDD_MT_LDISKFS2:
-		ret = ldiskfs_prepare_lustre(mop,
-					     default_mountopts, default_len,
-					     always_mountopts, always_len);
-		break;
-#endif /* HAVE_LDISKFS_OSD */
-#ifdef HAVE_ZFS_OSD
-	case LDD_MT_ZFS:
-		ret = zfs_prepare_lustre(mop,
-					 default_mountopts, default_len,
-					 always_mountopts, always_len);
-		break;
-#endif /* HAVE_ZFS_OSD */
-	default:
-		fatal();
-		fprintf(stderr, "unknown fs type %d '%s'\n",
-			ldd->ldd_mount_type, MT_STR(ldd));
+	if (backfs_mount_type_okay(ldd->ldd_mount_type))
+		ret = backfs_ops[ldd->ldd_mount_type]->prepare_lustre(mop,
+			default_mountopts, default_len,
+			always_mountopts, always_len);
+
+	else
 		ret = EINVAL;
-		break;
-	}
 
 	return ret;
 }
@@ -554,25 +664,11 @@ int osd_tune_lustre(char *dev, struct mount_opts *mop)
 	struct lustre_disk_data *ldd = &mop->mo_ldd;
 	int ret;
 
-	switch (ldd->ldd_mount_type) {
-#ifdef HAVE_LDISKFS_OSD
-	case LDD_MT_LDISKFS:
-	case LDD_MT_LDISKFS2:
-		ret = ldiskfs_tune_lustre(dev, mop);
-		break;
-#endif /* HAVE_LDISKFS_OSD */
-#ifdef HAVE_ZFS_OSD
-	case LDD_MT_ZFS:
-		ret = zfs_tune_lustre(dev, mop);
-		break;
-#endif /* HAVE_ZFS_OSD */
-	default:
-		fatal();
-		fprintf(stderr, "unknown fs type %d '%s'\n",
-				ldd->ldd_mount_type, MT_STR(ldd));
+	if (backfs_mount_type_okay(ldd->ldd_mount_type))
+		ret = backfs_ops[ldd->ldd_mount_type]->tune_lustre(dev, mop);
+
+	else
 		ret = EINVAL;
-		break;
-	}
 
 	return ret;
 }
@@ -582,25 +678,11 @@ int osd_label_lustre(struct mount_opts *mop)
 	struct lustre_disk_data *ldd = &mop->mo_ldd;
 	int ret;
 
-	switch (ldd->ldd_mount_type) {
-#ifdef HAVE_LDISKFS_OSD
-	case LDD_MT_LDISKFS:
-	case LDD_MT_LDISKFS2:
-		ret = ldiskfs_label_lustre(mop);
-		break;
-#endif /* HAVE_LDISKFS_OSD */
-#ifdef HAVE_ZFS_OSD
-	case LDD_MT_ZFS:
-		ret = zfs_label_lustre(mop);
-		break;
-#endif /* HAVE_ZFS_OSD */
-	default:
-		fatal();
-		fprintf(stderr, "unknown fs type %d '%s'\n",
-			ldd->ldd_mount_type, MT_STR(ldd));
+	if (backfs_mount_type_okay(ldd->ldd_mount_type))
+		ret = backfs_ops[ldd->ldd_mount_type]->label_lustre(mop);
+
+	else
 		ret = EINVAL;
-		break;
-	}
 
 	return ret;
 }
@@ -611,59 +693,41 @@ int osd_enable_quota(struct mkfs_opts *mop)
 	struct lustre_disk_data *ldd = &mop->mo_ldd;
 	int ret;
 
-	switch (ldd->ldd_mount_type) {
-#ifdef HAVE_LDISKFS_OSD
-	case LDD_MT_EXT3:
-	case LDD_MT_LDISKFS:
-	case LDD_MT_LDISKFS2:
-		ret = ldiskfs_enable_quota(mop);
-		break;
-#endif /* HAVE_LDISKFS_OSD */
-#ifdef HAVE_ZFS_OSD
-	case LDD_MT_ZFS:
-		fprintf(stderr, "this option is only valid for ldiskfs\n");
-		ret = EINVAL;
-		break;
-#endif /* HAVE_ZFS_OSD */
-	default:
-		fatal();
-		fprintf(stderr, "unknown fs type %d '%s'\n",
-			ldd->ldd_mount_type, MT_STR(ldd));
+	if (backfs_mount_type_okay(ldd->ldd_mount_type))
+		ret = backfs_ops[ldd->ldd_mount_type]->enable_quota(mop);
+
+	else
 		ret = EINVAL;
-		break;
-	}
 
 	return ret;
 }
 
 int osd_init(void)
 {
-	int ret = 0;
+	int i, ret = 0;
 
-#ifdef HAVE_LDISKFS_OSD
-	ret = ldiskfs_init();
-	if (ret)
-		return ret;
-#endif /* HAVE_LDISKFS_OSD */
-#ifdef HAVE_ZFS_OSD
-	ret = zfs_init();
-	/* we want to be able to set up a ldiskfs-based filesystem w/o
-	 * the ZFS modules installed, see ORI-425 */
-	if (ret)
-		ret = 0;
-#endif /* HAVE_ZFS_OSD */
+	for (i = 0; i < LDD_MT_LAST; ++i) {
+		backfs_ops[i] = load_backfs_module(i);
+		if (backfs_ops[i] != NULL)
+			ret = backfs_ops[i]->init();
+		if (ret)
+			break;
+	}
 
 	return ret;
 }
 
 void osd_fini(void)
 {
-#ifdef HAVE_LDISKFS_OSD
-	ldiskfs_fini();
-#endif /* HAVE_LDISKFS_OSD */
-#ifdef HAVE_ZFS_OSD
-	zfs_fini();
-#endif /* HAVE_ZFS_OSD */
+	int i;
+
+	for (i = 0; i < LDD_MT_LAST; ++i) {
+		if (backfs_ops[i] != NULL) {
+			backfs_ops[i]->fini();
+			unload_backfs_module(backfs_ops[i]);
+			backfs_ops[i] = NULL;
+		}
+	}
 }
 
 __u64 get_device_size(char* device)