X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Futils%2Fmkfs_lustre.c;h=53102768480e36e418cb82f3df7195f3bf362992;hp=070cb20379425c453a2a48f3e66688632fd21859;hb=593b6ab6d21976d37004621b86f37715df697e9e;hpb=56e0d0bd401ba7dadb19e21dac624f6eb9cee3f7 diff --git a/lustre/utils/mkfs_lustre.c b/lustre/utils/mkfs_lustre.c index 070cb20..5310276 100644 --- a/lustre/utils/mkfs_lustre.c +++ b/lustre/utils/mkfs_lustre.c @@ -27,7 +27,7 @@ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, Whamcloud, Inc. + * Copyright (c) 2011, 2012, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -47,6 +47,7 @@ #ifndef _GNU_SOURCE #define _GNU_SOURCE #endif +#include "mount_utils.h" #include #include #include @@ -64,20 +65,10 @@ #include #include -#ifdef __linux__ -/* libcfs.h is not really needed here, but on SLES10/PPC, fs.h includes idr.h - * which requires BITS_PER_LONG to be defined */ -#include -#ifndef BLKGETSIZE64 -#include /* for BLKGETSIZE64 */ -#endif -#include -#endif #include #include #include #include -#include "mount_utils.h" #ifndef PATH_MAX #define PATH_MAX 4096 @@ -85,52 +76,97 @@ char *progname; int verbose = 1; +int version; static int print_only = 0; -static int upgrade_to_18 = 0; + +#ifdef HAVE_LDISKFS_OSD +#define FSLIST_LDISKFS "ldiskfs" +#define HAVE_FSLIST +#else + #define FSLIST_LDISKFS "" +#endif /* HAVE_LDISKFS_OSD */ +#ifdef HAVE_ZFS_OSD + #ifdef HAVE_FSLIST + #define FSLIST_ZFS "|zfs" + #else + #define FSLIST_ZFS "zfs" + #define HAVE_FSLIST + #endif +#else + #define FSLIST_ZFS "" +#endif /* HAVE_ZFS_OSD */ + +#ifndef HAVE_FSLIST + #error "no backing OSD types (ldiskfs or ZFS) are configured" +#endif + +#define FSLIST FSLIST_LDISKFS FSLIST_ZFS void usage(FILE *out) { - fprintf(out, "%s v"LUSTRE_VERSION_STRING"\n", progname); - fprintf(out, "usage: %s [options] \n", progname); - fprintf(out, - "\t:block device or file (e.g /dev/sda or /tmp/ost1)\n" - "\ttarget types:\n" - "\t\t--ost: object storage, mutually exclusive with mdt,mgs\n" - "\t\t--mdt: metadata storage, mutually exclusive with ost\n" - "\t\t--mgs: configuration management service - one per site\n" - "\toptions (in order of popularity):\n" - "\t\t--mgsnode=[,<...>] : NID(s) of a remote mgs node\n" - "\t\t\trequired for all targets other than the mgs node\n" - "\t\t--fsname= : default is 'lustre'\n" - "\t\t--failnode=[,<...>] : NID(s) of a failover partner\n" - "\t\t\tcannot be used with --servicenode\n" - "\t\t--servicenode=[,<...>] : NID(s) of all service partners\n" - "\t\t\ttreat all nodes as equal service node, cannot be used with --failnode\n" - "\t\t--param = : set a permanent parameter\n" - "\t\t\te.g. --param sys.timeout=40\n" - "\t\t\t --param lov.stripesize=2M\n" - "\t\t--index=#N : target index (i.e. ost index within lov)\n" - "\t\t--comment=: arbitrary string (%d bytes)\n" - "\t\t--mountfsoptions= : permanent mount options\n" - "\t\t--network=[,<...>] : restrict OST/MDT to network(s)\n" + fprintf(out, "usage: %s [--backfstype="FSLIST"] " + "--fsname=\n" + "\t--index= [options] \n", progname); +#ifdef HAVE_ZFS_OSD + fprintf(out, "usage: %s --backfstype=zfs " + "--fsname= [options]\n" + "\t/\n" + "\t[[] [ ...] [vdev type>] ...]\n", + progname); +#endif + fprintf(out, + "\t:block device or file (e.g /dev/sda or /tmp/ost1)\n" +#ifdef HAVE_ZFS_OSD + "\t: name of ZFS pool where target is created " + "(e.g. tank)\n" + "\t: name of new dataset, must be unique within " + "pool (e.g. ost1)\n" + "\t: type of vdev (mirror, raidz, raidz2, spare, " + "cache, log)\n" +#endif + "\n" + "\ttarget types:\n" + "\t\t--mgs: configuration management service\n" + "\t\t--mdt: metadata storage, mutually exclusive with ost\n" + "\t\t--ost: object storage, mutually exclusive with mdt, mgs\n" + "\toptions (in order of popularity):\n" + "\t\t--index=#N: numerical target index (0..N)\n" + "\t\t\trequired for all targets other than the MGS\n" + "\t\t--fsname=<8_char_filesystem_name>: fs targets belong to\n" + "\t\t\trequired for all targets other than MGS\n" + "\t\t--mgsnode=[,<...>]: NID(s) of remote MGS\n" + "\t\t\trequired for all targets other than MGS\n" + "\t\t--mountfsoptions=: permanent mount options\n" + "\t\t--failnode=[,<...>]: NID(s) of backup failover node\n" + "\t\t\tmutually exclusive with --servicenode\n" + "\t\t--servicenode=[,<...>]: NID(s) of service partners\n" + "\t\t\ttreat nodes as equal service node, mutually exclusive " + "with --failnode\n" + "\t\t--param =: set a permanent parameter\n" + "\t\t\te.g. --param sys.timeout=40\n" + "\t\t\t --param lov.stripesize=2M\n" + "\t\t--network=[,<...>]: restrict OST/MDT to network(s)\n" #ifndef TUNEFS - "\t\t--backfstype= : backing fs type (ext3, ldiskfs)\n" - "\t\t--device-size=#N(KB) : device size for loop devices\n" - "\t\t--mkfsoptions= : format options\n" - "\t\t--reformat: overwrite an existing disk\n" - "\t\t--stripe-count-hint=#N : for optimizing MDT inode size\n" - "\t\t--iam-dir: use IAM directory format, not ext3 compatible\n" + "\t\t--backfstype=: backing fs type (ext3, ldiskfs)\n" + "\t\t--device-size=#N(KB): device size for loop devices\n" + "\t\t--mkfsoptions=: format options\n" + "\t\t--reformat: overwrite an existing disk\n" + "\t\t--replace: replace an old target with the same index\n" + "\t\t--stripe-count-hint=#N: for optimizing MDT inode size\n" #else - "\t\t--erase-params : erase all old parameter settings\n" - "\t\t--nomgs: turn off MGS service on this MDT\n" - "\t\t--writeconf: erase all config logs for this fs.\n" + "\t\t--erase-params: erase all old parameter settings\n" + "\t\t--nomgs: turn off MGS service on this MDT\n" + "\t\t--writeconf: erase all config logs for this fs.\n" + "\t\t--quota: enable space accounting on old 2.x device.\n" #endif - "\t\t--dryrun: just report what we would do; " - "don't write to disk\n" - "\t\t--verbose : e.g. show mkfs progress\n" - "\t\t--quiet\n", - (int)sizeof(((struct lustre_disk_data *)0)->ldd_userdata)); - return; + "\t\t--comment=: arbitrary string (%d bytes)\n" + "\t\t--dryrun: report what we would do; don't write to disk\n" + "\t\t--verbose: e.g. show mkfs progress\n" + "\t\t-V|--version: output build version of the utility and\n" + "\t\t\texit\n" + "\t\t--quiet\n", + (int)sizeof(((struct lustre_disk_data *)0)->ldd_userdata)); + return; } /* ==================== Lustre config functions =============*/ @@ -148,7 +184,7 @@ void print_ldd(char *str, struct lustre_disk_data *ldd) printf("Lustre FS: %s\n", ldd->ldd_fsname); printf("Mount type: %s\n", MT_STR(ldd)); printf("Flags: %#x\n", ldd->ldd_flags); - printf(" (%s%s%s%s%s%s%s%s%s%s)\n", + printf(" (%s%s%s%s%s%s%s%s%s)\n", IS_MDT(ldd) ? "MDT ":"", IS_OST(ldd) ? "OST ":"", IS_MGS(ldd) ? "MGS ":"", @@ -156,7 +192,6 @@ void print_ldd(char *str, struct lustre_disk_data *ldd) ldd->ldd_flags & LDD_F_VIRGIN ? "first_time ":"", ldd->ldd_flags & LDD_F_UPDATE ? "update ":"", ldd->ldd_flags & LDD_F_WRITECONF ? "writeconf ":"", - ldd->ldd_flags & LDD_F_IAM_DIR ? "IAM_dir_format ":"", ldd->ldd_flags & LDD_F_NO_PRIMNODE? "no_primnode ":"", ldd->ldd_flags & LDD_F_UPGRADE14 ? "upgrade1.4 ":""); printf("Persistent mount opts: %s\n", ldd->ldd_mount_opts); @@ -168,15 +203,18 @@ void print_ldd(char *str, struct lustre_disk_data *ldd) void set_defaults(struct mkfs_opts *mop) { - mop->mo_ldd.ldd_magic = LDD_MAGIC; - mop->mo_ldd.ldd_config_ver = 1; - mop->mo_ldd.ldd_flags = LDD_F_NEED_INDEX | LDD_F_UPDATE | LDD_F_VIRGIN; - mop->mo_mgs_failnodes = 0; - strcpy(mop->mo_ldd.ldd_fsname, "lustre"); - mop->mo_ldd.ldd_mount_type = LDD_MT_LDISKFS; - - mop->mo_ldd.ldd_svindex = INDEX_UNASSIGNED; - mop->mo_stripe_count = 1; + mop->mo_ldd.ldd_magic = LDD_MAGIC; + mop->mo_ldd.ldd_config_ver = 1; + mop->mo_ldd.ldd_flags = LDD_F_NEED_INDEX | LDD_F_UPDATE | LDD_F_VIRGIN; +#ifdef HAVE_LDISKFS_OSD + mop->mo_ldd.ldd_mount_type = LDD_MT_LDISKFS; +#else + mop->mo_ldd.ldd_mount_type = LDD_MT_ZFS; +#endif + mop->mo_ldd.ldd_svindex = INDEX_UNASSIGNED; + mop->mo_mgs_failnodes = 0; + mop->mo_stripe_count = 1; + mop->mo_pool_vdevs = NULL; } static inline void badopt(const char *opt, char *type) @@ -209,10 +247,11 @@ static char *convert_hostnames(char *s1) sep = *s2; *s2 = '\0'; nid = libcfs_str2nid(s1); + *s2 = sep; if (nid == LNET_NID_ANY) { - fprintf(stderr, "%s: Can't parse NID '%s'\n", - progname, s1); + fprintf(stderr, "%s: Cannot resolve hostname '%s'.\n", + progname, s1); free(converted); return NULL; } @@ -236,53 +275,50 @@ static char *convert_hostnames(char *s1) int parse_opts(int argc, char *const argv[], struct mkfs_opts *mop, char **mountopts) { - static struct option long_opt[] = { - {"iam-dir", 0, 0, 'a'}, - {"backfstype", 1, 0, 'b'}, - {"stripe-count-hint", 1, 0, 'c'}, - {"comment", 1, 0, 'u'}, - {"configdev", 1, 0, 'C'}, - {"device-size", 1, 0, 'd'}, - {"dryrun", 0, 0, 'n'}, - {"erase-params", 0, 0, 'e'}, - {"failnode", 1, 0, 'f'}, - {"failover", 1, 0, 'f'}, - {"mgs", 0, 0, 'G'}, - {"help", 0, 0, 'h'}, - {"index", 1, 0, 'i'}, - {"mkfsoptions", 1, 0, 'k'}, - {"mgsnode", 1, 0, 'm'}, - {"mgsnid", 1, 0, 'm'}, - {"mdt", 0, 0, 'M'}, - {"fsname",1, 0, 'L'}, - {"noformat", 0, 0, 'n'}, - {"nomgs", 0, 0, 'N'}, - {"mountfsoptions", 1, 0, 'o'}, - {"ost", 0, 0, 'O'}, - {"param", 1, 0, 'p'}, - {"print", 0, 0, 'n'}, - {"quiet", 0, 0, 'q'}, - {"reformat", 0, 0, 'r'}, - {"servicenode", 1, 0, 's'}, - {"verbose", 0, 0, 'v'}, - {"writeconf", 0, 0, 'w'}, - {"upgrade_to_18", 0, 0, 'U'}, - {"network", 1, 0, 't'}, - {0, 0, 0, 0} - }; - char *optstring = "b:c:C:d:ef:Ghi:k:L:m:MnNo:Op:Pqrs:t:Uu:vw"; - int opt; - int rc, longidx; - int failnode_set = 0, servicenode_set = 0; + static struct option long_opt[] = { + { "backfstype", required_argument, NULL, 'b' }, + { "stripe-count-hint", required_argument, NULL, 'c' }, + { "comment", required_argument, NULL, 'u' }, + { "configdev", required_argument, NULL, 'C' }, + { "device-size", required_argument, NULL, 'd' }, + { "dryrun", no_argument, NULL, 'n' }, + { "erase-params", no_argument, NULL, 'e' }, + { "failnode", required_argument, NULL, 'f' }, + { "failover", required_argument, NULL, 'f' }, + { "mgs", no_argument, NULL, 'G' }, + { "help", no_argument, NULL, 'h' }, + { "index", required_argument, NULL, 'i' }, + { "mkfsoptions", required_argument, NULL, 'k' }, + { "mgsnode", required_argument, NULL, 'm' }, + { "mgsnid", required_argument, NULL, 'm' }, + { "mdt", no_argument, NULL, 'M' }, + { "fsname", required_argument, NULL, 'L' }, + { "noformat", no_argument, NULL, 'n' }, + { "nomgs", no_argument, NULL, 'N' }, + { "mountfsoptions", required_argument, NULL, 'o' }, + { "ost", no_argument, NULL, 'O' }, + { "param", required_argument, NULL, 'p' }, + { "print", no_argument, NULL, 'n' }, + { "quiet", no_argument, NULL, 'q' }, + { "quota", no_argument, NULL, 'Q' }, + { "reformat", no_argument, NULL, 'r' }, + { "replace", no_argument, NULL, 'R' }, + { "servicenode", required_argument, NULL, 's' }, + { "network", required_argument, NULL, 't' }, + { "verbose", no_argument, NULL, 'v' }, + { "version", no_argument, NULL, 'V' }, + { "writeconf", no_argument, NULL, 'w' }, + { 0, 0, NULL, 0 } + }; + char *optstring = "b:c:C:d:ef:Ghi:k:L:m:MnNo:Op:PqrRs:t:Uu:vVw"; + int opt; + int rc, longidx; + int failnode_set = 0, servicenode_set = 0; + int replace = 0; while ((opt = getopt_long(argc, argv, optstring, long_opt, &longidx)) != EOF) { switch (opt) { - case 'a': { - if (IS_MDT(&mop->mo_ldd)) - mop->mo_ldd.ldd_flags |= LDD_F_IAM_DIR; - break; - } case 'b': { int i = 0; while (i < LDD_MT_LAST) { @@ -292,6 +328,11 @@ int parse_opts(int argc, char *const argv[], struct mkfs_opts *mop, } i++; } + if (i == LDD_MT_LAST) { + fprintf(stderr, "%s: invalid backend filesystem" + " type %s\n", progname, optarg); + return 1; + } break; } case 'c': @@ -312,9 +353,9 @@ int parse_opts(int argc, char *const argv[], struct mkfs_opts *mop, //FIXME printf("Configdev not implemented\n"); return 1; - case 'd': - mop->mo_device_sz = atol(optarg); - break; + case 'd': + mop->mo_device_kb = atol(optarg); + break; case 'e': mop->mo_ldd.ldd_params[0] = '\0'; /* Must update the mgs logs */ @@ -365,13 +406,9 @@ int parse_opts(int argc, char *const argv[], struct mkfs_opts *mop, " a registered target\n", progname); return 1; } - if (IS_MDT(&mop->mo_ldd) || IS_OST(&mop->mo_ldd)) { - mop->mo_ldd.ldd_svindex = atol(optarg); - mop->mo_ldd.ldd_flags &= ~LDD_F_NEED_INDEX; - } else { - badopt(long_opt[longidx].name, "MDT,OST"); - return 1; - } + /* LU-2374: check whether it is OST/MDT later */ + mop->mo_ldd.ldd_svindex = atol(optarg); + mop->mo_ldd.ldd_flags &= ~LDD_F_NEED_INDEX; break; case 'k': strscpy(mop->mo_mkfsopts, optarg, @@ -441,6 +478,9 @@ int parse_opts(int argc, char *const argv[], struct mkfs_opts *mop, case 'r': mop->mo_flags |= MO_FORCEFORMAT; break; + case 'R': + replace = 1; + break; case 't': if (!IS_MDT(&mop->mo_ldd) && !IS_OST(&mop->mo_ldd)) { badopt(long_opt[longidx].name, "MDT,OST"); @@ -461,15 +501,20 @@ int parse_opts(int argc, char *const argv[], struct mkfs_opts *mop, strscpy(mop->mo_ldd.ldd_userdata, optarg, sizeof(mop->mo_ldd.ldd_userdata)); break; - case 'v': - verbose++; - break; - case 'w': - mop->mo_ldd.ldd_flags |= LDD_F_WRITECONF; - break; - case 'U': - upgrade_to_18 = 1; - break; + case 'v': + verbose++; + break; + case 'V': + ++version; + fprintf(stdout, "%s %s\n", progname, + LUSTRE_VERSION_STRING); + return 0; + case 'w': + mop->mo_ldd.ldd_flags |= LDD_F_WRITECONF; + break; + case 'Q': + mop->mo_flags |= MO_QUOTA; + break; default: if (opt != '?') { fatal(); @@ -479,29 +524,38 @@ int parse_opts(int argc, char *const argv[], struct mkfs_opts *mop, } }//while - /* Last arg is device */ - if (optind != argc - 1) { - fatal(); - fprintf(stderr, "Bad argument: %s\n", argv[optind]); - return EINVAL; - } + /* Need to clear this flag after parsing 'L' and 'i' options. */ + if (replace) + mop->mo_ldd.ldd_flags &= ~LDD_F_VIRGIN; - /* single argument: */ - if (argc == 2) - ++print_only; + if (optind == argc) { + /* The user didn't specify device name */ + fatal(); + fprintf(stderr, "Not enough arguments - device name or " + "pool/dataset name not specified.\n"); + return EINVAL; + } else { + /* The device or pool/filesystem name */ + strscpy(mop->mo_device, argv[optind], sizeof(mop->mo_device)); + + /* Followed by optional vdevs */ + if (optind < argc - 1) + mop->mo_pool_vdevs = (char **) &argv[optind + 1]; + } return 0; } int main(int argc, char *const argv[]) { - struct mkfs_opts mop; - struct lustre_disk_data *ldd; - char *mountopts = NULL; - char always_mountopts[512] = ""; - char default_mountopts[512] = ""; + struct mkfs_opts mop; + struct lustre_disk_data *ldd; + char *mountopts = NULL; + char always_mountopts[512] = ""; + char default_mountopts[512] = ""; unsigned mount_type; - int ret = 0; + int ret = 0; + int ret2 = 0; if ((progname = strrchr(argv[0], '/')) != NULL) progname++; @@ -519,6 +573,10 @@ int main(int argc, char *const argv[]) /* device is last arg */ strscpy(mop.mo_device, argv[argc - 1], sizeof(mop.mo_device)); + ret = osd_init(); + if (ret) + return ret; + #ifdef TUNEFS /* For tunefs, we must read in the old values before parsing any new ones. */ @@ -532,6 +590,7 @@ int main(int argc, char *const argv[]) ret = ENODEV; goto out; } + mop.mo_ldd.ldd_mount_type = mount_type; ret = osd_read_ldd(mop.mo_device, &mop.mo_ldd); if (ret) { @@ -540,16 +599,28 @@ int main(int argc, char *const argv[]) "(%d)\n", mop.mo_device, ret); goto out; } - if (strstr(mop.mo_ldd.ldd_params, PARAM_MGSNODE)) - mop.mo_mgs_failnodes++; + mop.mo_ldd.ldd_flags &= ~(LDD_F_WRITECONF | LDD_F_VIRGIN); + + /* svname of the form lustre:OST1234 means never registered */ + ret = strlen(mop.mo_ldd.ldd_svname); + if (mop.mo_ldd.ldd_svname[ret - 8] == ':') { + mop.mo_ldd.ldd_svname[ret - 8] = '-'; + mop.mo_ldd.ldd_flags |= LDD_F_VIRGIN; + } else if (mop.mo_ldd.ldd_svname[ret - 8] == '=') { + mop.mo_ldd.ldd_svname[ret - 8] = '-'; + mop.mo_ldd.ldd_flags |= LDD_F_WRITECONF; + } - if (verbose > 0) - print_ldd("Read previous values", &(mop.mo_ldd)); + if (strstr(mop.mo_ldd.ldd_params, PARAM_MGSNODE)) + mop.mo_mgs_failnodes++; + + if (verbose > 0) + print_ldd("Read previous values", &(mop.mo_ldd)); #endif - ret = parse_opts(argc, argv, &mop, &mountopts); - if (ret) - goto out; + ret = parse_opts(argc, argv, &mop, &mountopts); + if (ret || version) + goto out; ldd = &mop.mo_ldd; @@ -567,6 +638,18 @@ int main(int argc, char *const argv[]) goto out; } + /* Stand alone MGS doesn't need a index */ + if (!IS_MDT(ldd) && IS_MGS(ldd)) { +#ifndef TUNEFS /* mkfs.lustre */ + /* But if --index was specified flag an error */ + if (!(mop.mo_ldd.ldd_flags & LDD_F_NEED_INDEX)) { + badopt("index", "MDT,OST"); + goto out; + } +#endif + mop.mo_ldd.ldd_flags &= ~LDD_F_NEED_INDEX; + } + if ((mop.mo_ldd.ldd_flags & (LDD_F_NEED_INDEX | LDD_F_UPGRADE14)) == (LDD_F_NEED_INDEX | LDD_F_UPGRADE14)) { fatal(); @@ -575,26 +658,32 @@ int main(int argc, char *const argv[]) ret = EINVAL; goto out; } -#if 0 - /* - * Comment out these 2 checks temporarily, since for multi-MDSes - * in single node only 1 mds node could have mgs service - */ - if (IS_MDT(ldd) && !IS_MGS(ldd) && (mop.mo_mgs_failnodes == 0)) { - verrprint("No management node specified, adding MGS to this " - "MDT\n"); - ldd->ldd_flags |= LDD_F_SV_TYPE_MGS; - } - if (!IS_MGS(ldd) && (mop.mo_mgs_failnodes == 0)) { - fatal(); - if (IS_MDT(ldd)) - fprintf(stderr, "Must specify --mgs or --mgsnode=\n"); - else - fprintf(stderr, "Must specify --mgsnode=\n"); - ret = EINVAL; - goto out; - } -#endif + + if (mop.mo_ldd.ldd_flags & LDD_F_NEED_INDEX) + fprintf(stderr, "warning: %s: for Lustre 2.4 and later, the " + "target index must be specified with --index\n", + mop.mo_device); + + /* If no index is supplied for MDT by default set index to zero */ + if (IS_MDT(ldd) && (ldd->ldd_svindex == INDEX_UNASSIGNED)) { + mop.mo_ldd.ldd_flags &= ~LDD_F_NEED_INDEX; + mop.mo_ldd.ldd_svindex = 0; + } + if (!IS_MGS(ldd) && (mop.mo_mgs_failnodes == 0)) { + fatal(); + if (IS_MDT(ldd)) + fprintf(stderr, "Must specify --mgs or --mgsnode\n"); + else + fprintf(stderr, "Must specify --mgsnode\n"); + ret = EINVAL; + goto out; + } + if ((IS_MDT(ldd) || IS_OST(ldd)) && mop.mo_ldd.ldd_fsname[0] == '\0') { + fatal(); + fprintf(stderr, "Must specify --fsname for MDT/OST device\n"); + ret = EINVAL; + goto out; + } /* These are the permanent mount options (always included) */ ret = osd_prepare_lustre(&mop, @@ -678,16 +767,31 @@ int main(int argc, char *const argv[]) } /* Format the backing filesystem */ - ret = make_lustre_backfs(&mop); + ret = osd_make_lustre(&mop); if (ret != 0) { fatal(); fprintf(stderr, "mkfs failed %d\n", ret); goto out; } +#else + /* update svname with '=' to refresh config */ + if (mop.mo_ldd.ldd_flags & LDD_F_WRITECONF) { + struct mount_opts opts; + opts.mo_ldd = mop.mo_ldd; + opts.mo_source = mop.mo_device; + (void) osd_label_lustre(&opts); + } + + /* Enable quota accounting */ + if (mop.mo_flags & MO_QUOTA) { + ret = osd_enable_quota(&mop); + goto out; + } + #endif /* Write our config files */ - ret = write_local_files(&mop); + ret = osd_write_ldd(&mop); if (ret != 0) { fatal(); fprintf(stderr, "failed to write local files\n"); @@ -695,7 +799,10 @@ int main(int argc, char *const argv[]) } out: - loop_cleanup(&mop); + osd_fini(); + ret2 = loop_cleanup(&mop); + if (ret == 0) + ret = ret2; /* Fix any crazy return values from system() */ if (ret && ((ret & 255) == 0))