* 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;
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;
char cmd[PATH_MAX];
int cmdsz = sizeof(cmd);
-#ifdef LOOP_CTL_GET_FREE
+#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);
free(ops);
return NULL;
}
+
+ /* optional methods */
+ DLSYM(name, ops, fix_mountopts);
+
return ops;
}
}
if (backfs_ops[mount_type] == NULL) {
fatal();
- fprintf(stderr, "unhandled fs type %d '%s'\n",
+ fprintf(stderr, "unhandled/unloaded fs type %d '%s'\n",
mount_type, mt_str(mount_type));
return 0;
}
}
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;
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);
+ wanted_mountopts, len);
else
ret = EINVAL;
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 osd_init(void)
{
- int i, ret = 0;
+ 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)
- ret = backfs_ops[i]->init();
- if (ret)
- break;
+ 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;