X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fmount_utils.c;h=2027b28eb59547bba4d01cd0579554cf2814b7c4;hb=70e9d4ecc9130aeed1260d78cd8b33a5cde6edd7;hp=00e5d5c20576db37063854050cf7b9b691f3c272;hpb=7bf1d7c6cb7d0a7231b3fdcb9e3d3ec3129fb427;p=fs%2Flustre-release.git

diff --git a/lustre/utils/mount_utils.c b/lustre/utils/mount_utils.c
index 00e5d5c..2027b28 100644
--- a/lustre/utils/mount_utils.c
+++ b/lustre/utils/mount_utils.c
@@ -15,18 +15,15 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
 /*
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
- * Copyright (c) 2011, 2012, Intel Corporation.
+ *
+ * Copyright (c) 2012, 2016, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -37,15 +34,30 @@
 #  include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#include "mount_utils.h"
+#include <inttypes.h>
+#include <limits.h>
+#include <mntent.h>
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
+#include <unistd.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 <sys/types.h>
+#include <dirent.h>
+#include <dlfcn.h>
+
+#ifdef HAVE_GSS
+#include <keyutils.h>
+#include <lustre/utils/gss/sk_utils.h>
+#endif
+
+#include "mount_utils.h"
 
 extern char *progname;
 extern int verbose;
@@ -53,6 +65,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 +154,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;
@@ -180,19 +231,63 @@ int check_mtab_entry(char *spec1, char *spec2, char *mtpt, char *type)
 	return 0;
 }
 
-#define PROC_DIR	"/proc/"
+#include <sys/vfs.h>
+#include <linux/magic.h>
+
 static int mtab_is_proc(const char *mtab)
 {
-	char path[16];
-
-	if (readlink(mtab, path, sizeof(path)) < 0)
+	struct statfs s;
+	if (statfs(mtab, &s) < 0)
 		return 0;
 
-	if (strncmp(path, PROC_DIR, strlen(PROC_DIR)))
-		return 0;
+	return (s.f_type == PROC_SUPER_MAGIC);
+}
 
-	return 1;
+#ifdef HAVE_LIBMOUNT
+
+# include <libmount/libmount.h>
+
+/*
+ * The libmount is part of util-linux since 2.18.
+ * We use it to update utab to avoid umount would
+ * blocked in some rare case.
+ */
+int update_utab_entry(struct mount_opts *mop)
+{
+	struct libmnt_fs *fs = mnt_new_fs();
+	struct libmnt_update *upd;
+	int rc;
+
+	mnt_fs_set_source(fs, mop->mo_source);
+	mnt_fs_set_target(fs, mop->mo_target);
+	mnt_fs_set_fstype(fs, "lustre");
+	mnt_fs_set_attributes(fs, "lustre");
+
+	upd = mnt_new_update();
+	if (!upd)
+		return -ENOMEM;
+
+	rc = mnt_update_set_fs(upd, mop->mo_nomtab ? MS_REMOUNT : 0, NULL, fs);
+	if (rc == 1) /* update is unnecessary */
+		rc = 0;
+	if (rc) {
+		fprintf(stderr,
+			"error: failed to save utab entry: rc = %d\n", rc);
+	} else {
+		rc = mnt_update_table(upd, NULL);
+	}
+
+	mnt_free_update(upd);
+	mnt_free_fs(fs);
+
+	return rc;
+}
+#else
+int update_utab_entry(struct mount_opts *mop)
+{
+	return 0;
 }
+#endif /* HAVE_LIBMOUNT */
 
 int update_mtab_entry(char *spec, char *mtpt, char *type, char *opts,
 		int flags, int freq, int pass)
@@ -214,12 +309,12 @@ int update_mtab_entry(char *spec, char *mtpt, char *type, char *opts,
 
 	fp = setmntent(MOUNTED, "a+");
 	if (fp == NULL) {
-		fprintf(stderr, "%s: setmntent(%s): %s:",
+		fprintf(stderr, "%s: setmntent(%s): %s\n",
 			progname, MOUNTED, strerror (errno));
 		rc = 16;
 	} else {
 		if ((addmntent(fp, &mnt)) == 1) {
-			fprintf(stderr, "%s: addmntent: %s:",
+			fprintf(stderr, "%s: addmntent: %s\n",
 				progname, strerror (errno));
 			rc = 16;
 		}
@@ -253,8 +348,7 @@ static int in_mntlist(char *opt, char *mntlist)
  * present in mountopts.  The justwarn boolean toggles between error and
  * warning message.  Return an error count.
  */
-int check_mountfsoptions(char *mountopts, char *wanted_mountopts,
-			 int justwarn)
+int check_mountfsoptions(char *mountopts, char *wanted_mountopts)
 {
 	char *ml, *mlp, *item, *ctx = NULL;
 	int errors = 0;
@@ -266,9 +360,8 @@ int check_mountfsoptions(char *mountopts, char *wanted_mountopts,
 	mlp = ml;
 	while ((item = strtok_r(mlp, ",", &ctx))) {
 		if (!in_mntlist(item, mountopts)) {
-			fprintf(stderr, "%s: %s mount option `%s' is missing\n",
-				progname, justwarn ? "Warning: default"
-				: "Error: mandatory", item);
+			fprintf(stderr, "%s: Error: mandatory mount option"
+				" '%s' is missing\n", progname, item);
 			errors++;
 		}
 		mlp = NULL;
@@ -307,7 +400,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 +415,25 @@ int loop_setup(struct mkfs_opts *mop)
 		char cmd[PATH_MAX];
 		int cmdsz = sizeof(cmd);
 
+#ifdef HAVE_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);
+		close(ret);
+		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);
 
@@ -356,11 +466,23 @@ int loop_setup(struct mkfs_opts *mop)
 int loop_cleanup(struct mkfs_opts *mop)
 {
 	char cmd[150];
-	int ret = 1;
+	int ret = 0;
+
 	if ((mop->mo_flags & MO_IS_LOOP) && *mop->mo_loopdev) {
+		int tries;
+
 		sprintf(cmd, "losetup -d %s", mop->mo_loopdev);
-		ret = run_command(cmd, sizeof(cmd));
+		for (tries = 0; tries < 3; tries++) {
+			ret = run_command(cmd, sizeof(cmd));
+			if (ret == 0)
+				break;
+			sleep(1);
+		}
 	}
+
+	if (ret != 0)
+		fprintf(stderr, "cannot cleanup %s: rc = %d\n",
+			mop->mo_loopdev, ret);
 	return ret;
 }
 
@@ -368,7 +490,7 @@ int loop_format(struct mkfs_opts *mop)
 {
 	int fd;
 
-	if (mop->mo_device_sz == 0) {
+	if (mop->mo_device_kb == 0) {
 		fatal();
 		fprintf(stderr, "loop device requires a --device-size= "
 			"param\n");
@@ -383,7 +505,7 @@ int loop_format(struct mkfs_opts *mop)
 		return errno;
 	}
 
-	if (ftruncate(fd, mop->mo_device_sz * 1024) != 0) {
+	if (ftruncate(fd, mop->mo_device_kb * 1024) != 0) {
 		close(fd);
 		fatal();
 		fprintf(stderr, "%s: Unable to truncate backing store: %s\n",
@@ -395,31 +517,132 @@ 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) */
+	strncpy(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;
+	}
+
+	/* optional methods */
+	DLSYM(name, ops, fix_mountopts);
+
+	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 (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/unloaded 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;
 }
@@ -429,25 +652,10 @@ 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;
 }
@@ -455,20 +663,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;
@@ -480,87 +685,52 @@ 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;
 }
 
 int osd_prepare_lustre(struct mkfs_opts *mop,
-		char *default_mountopts, int default_len,
-		char *always_mountopts, int always_len)
+		       char *wanted_mountopts, size_t len)
 {
 	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,
+							wanted_mountopts, len);
+	else
 		ret = EINVAL;
-		break;
-	}
 
 	return ret;
 }
 
+int osd_fix_mountopts(struct mkfs_opts *mop, char *mountopts, size_t len)
+{
+	struct lustre_disk_data *ldd = &mop->mo_ldd;
+
+	if (!backfs_mount_type_okay(ldd->ldd_mount_type))
+		return EINVAL;
+
+	if (backfs_ops[ldd->ldd_mount_type]->fix_mountopts == NULL)
+		return 0;
+
+	return backfs_ops[ldd->ldd_mount_type]->fix_mountopts(mop, mountopts,
+							      len);
+}
+
 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;
 }
@@ -570,25 +740,10 @@ 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;
 }
@@ -599,59 +754,45 @@ 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;
-
-#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 */
+	int i, rc, ret = EINVAL;
+
+	for (i = 0; i < LDD_MT_LAST; ++i) {
+		rc = 0;
+		backfs_ops[i] = load_backfs_module(i);
+		if (backfs_ops[i] != NULL)
+			rc = backfs_ops[i]->init();
+		if (rc != 0) {
+			backfs_ops[i]->fini();
+			unload_backfs_module(backfs_ops[i]);
+			backfs_ops[i] = NULL;
+		} else
+			ret = 0;
+	}
 
 	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)
@@ -684,16 +825,29 @@ __u64 get_device_size(char* device)
 		return 0;
 	}
 
-	vprint("device size = "LPU64"MB\n", size >> 20);
+	vprint("device size = %juMB\n", (uintmax_t)(size >> 20));
 	/* return value in KB */
 	return size >> 10;
 }
 
-int file_create(char *path, int size)
+int file_create(char *path, __u64 size)
 {
+	__u64 size_max;
 	int ret;
 	int fd;
 
+	/*
+	 * Since "size" is in KB, the file offset it represents could overflow
+	 * off_t.
+	 */
+	size_max = (off_t)1 << (_FILE_OFFSET_BITS - 1 - 10);
+	if (size >= size_max) {
+		fprintf(stderr, "%s: %ju KB: Backing store size must be "
+			"smaller than %ju KB\n", progname, (uintmax_t) size,
+			(uintmax_t)size_max);
+		return EFBIG;
+	}
+
 	ret = access(path, F_OK);
 	if (ret == 0) {
 		ret = unlink(path);
@@ -720,3 +874,81 @@ int file_create(char *path, int size)
 
 	return 0;
 }
+
+#ifdef HAVE_GSS
+#ifdef HAVE_OPENSSL_SSK
+int load_shared_keys(struct mount_opts *mop)
+{
+	DIR *dir;
+	struct dirent *dentry;
+	struct stat sbuf;
+	char fullpath[PATH_MAX];
+	char *path = mop->mo_skpath;
+	int rc;
+
+	/* init logging */
+	sk_init_logging(NULL, 1, 1);
+
+	rc = stat(path, &sbuf);
+	if (rc < 0) {
+		fprintf(stderr, "stat() failed for key %s: %s\n", path,
+			strerror(errno));
+		return -errno;
+	}
+
+	/* Load individual keys or a directory of them */
+	if (S_ISREG(sbuf.st_mode)) {
+		return sk_load_keyfile(path);
+	} else if (!S_ISDIR(sbuf.st_mode)) {
+		fprintf(stderr, "Invalid shared key path: %s\n", path);
+		return -ENOKEY;
+	}
+
+	dir = opendir(path);
+	if (dir == NULL) {
+		fprintf(stderr, "Unable to open shared key directory: %s\n",
+			path);
+		return -ENOENT;
+	}
+
+	/* Loop through the files in the directory attempting to load them.
+	 * Any issue with loading the keyfile is treated as an error although
+	 * the loop continues until all files have been attempted.  This will
+	 * allow all errors be reported at once rather then requiring
+	 * incremental corrections to fix each one and try again. */
+	while ((dentry = readdir(dir)) != NULL) {
+		if (strcmp(".", dentry->d_name) == 0 ||
+		    strcmp("..", dentry->d_name) == 0)
+			continue;
+
+		rc = snprintf(fullpath, PATH_MAX, "%s/%s", path,
+			      dentry->d_name);
+		if (rc >= PATH_MAX) {
+			fprintf(stderr, "Path too long for %s/%s\n",
+				path, dentry->d_name);
+			rc = -ENAMETOOLONG;
+			continue;
+		}
+
+		rc = stat(fullpath, &sbuf);
+		if (rc < 0) {
+			fprintf(stderr, "Unable to stat %s: %s\n", fullpath,
+				strerror(errno));
+			rc = -errno;
+			continue;
+		}
+
+		if (!S_ISREG(sbuf.st_mode))
+			continue;
+
+		rc = sk_load_keyfile(fullpath);
+		if (rc) {
+			fprintf(stderr, "Failed to load key %s\n", fullpath);
+		}
+	}
+	closedir(dir);
+
+	return rc;
+}
+#endif /* HAVE_OPENSSL_SSK */
+#endif /* HAVE_GSS */