* 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) 2012, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif
+#include "mount_utils.h"
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
#include <lustre_param.h>
#include <lnet/lnetctl.h>
#include <lustre_ver.h>
-#include "mount_utils.h"
#define MAX_HW_SECTORS_KB_PATH "queue/max_hw_sectors_kb"
#define MAX_SECTORS_KB_PATH "queue/max_sectors_kb"
if (num < 1 && ferror(filep)) {
fprintf(stderr, "%s: Unable to write to file (%s): %s\n",
progname, filepnm, strerror(errno));
+ fclose(filep);
goto out_umnt;
}
fclose(filep);
if (num_read < 1 && ferror(filep)) {
fprintf(stderr, "%s: Unable to read from file %s: %s\n",
progname, filepnm, strerror(errno));
- goto out_close;
}
+ fclose(filep);
}
-out_close:
- fclose(filep);
snprintf(cmd, cmdsz, "rm -rf %s", tmpdir);
run_command(cmd, cmdsz);
}
}
-static void enable_default_ext4_features(struct mkfs_opts *mop, char *anchor,
- size_t maxbuflen, int user_spec)
+static int enable_default_ext4_features(struct mkfs_opts *mop, char *anchor,
+ size_t maxbuflen, int user_spec)
{
if (IS_OST(&mop->mo_ldd)) {
append_unique(anchor, user_spec ? "," : " -O ",
/* The following options are only valid for ext4-based ldiskfs.
* If --backfstype=ext3 is specified, do not enable them. */
if (mop->mo_ldd.ldd_mount_type == LDD_MT_EXT3)
- return;
+ return 0;
+
+ /* Enable quota by default */
+ if (is_e2fsprogs_feature_supp("-O quota") == 0) {
+ append_unique(anchor, ",", "quota", NULL, maxbuflen);
+ } else {
+ fatal();
+ fprintf(stderr, "\"-O quota\" must be supported by "
+ "e2fsprogs, please upgrade your e2fsprogs.\n");
+ return EINVAL;
+ }
/* Allow files larger than 2TB. Also needs LU-16, but not harmful. */
if (is_e2fsprogs_feature_supp("-O huge_file") == 0)
}
}
/* Don't add any more "-O" options here, see last comment above */
+ return 0;
}
/**
start = moveopts_to_end(start);
maxbuflen = sizeof(mop->mo_mkfsopts) -
(start - mop->mo_mkfsopts) - strlen(start);
- enable_default_ext4_features(mop, start, maxbuflen, 1);
+ ret = enable_default_ext4_features(mop, start, maxbuflen, 1);
} else {
start = mop->mo_mkfsopts + strlen(mop->mo_mkfsopts),
maxbuflen = sizeof(mop->mo_mkfsopts) -
strlen(mop->mo_mkfsopts);
- enable_default_ext4_features(mop, start, maxbuflen, 0);
+ ret = enable_default_ext4_features(mop, start, maxbuflen, 0);
}
+ if (ret)
+ return ret;
/* end handle -O mkfs options */
/* start handle -E mkfs options */
return NULL;
if (devname[0] != '/') {
- if (getcwd(buf, sizeof(buf) - 1) == NULL)
+ if (getcwd(buf, sizeof(buf) - 1) == NULL) {
+ free(path);
return NULL;
+ }
strcat(buf, "/");
strcat(buf, devname);
} else {
return ret;
}
+static int is_feature_enabled(const char *feature, const char *devpath)
+{
+ char cmd[PATH_MAX];
+ FILE *fp;
+ char enabled_features[4096] = "";
+
+ snprintf(cmd, sizeof(cmd), "%s -R features %s 2>&1",
+ DEBUGFS, devpath);
+
+ /* Using popen() instead of run_command() since debugfs does
+ * not return proper error code if command is not supported */
+ fp = popen(cmd, "r");
+ if (!fp) {
+ fprintf(stderr, "%s: %s\n", progname, strerror(errno));
+ return 0;
+ }
+
+ fread(enabled_features, 1, sizeof(enabled_features), fp);
+ fclose(fp);
+
+ if (strstr(enabled_features, feature))
+ return 1;
+ return 0;
+}
+
+/* Enable quota accounting */
+int ldiskfs_enable_quota(struct mkfs_opts *mop)
+{
+ char *dev;
+ char cmd[512];
+ int cmdsz = sizeof(cmd), ret;
+
+ if (is_e2fsprogs_feature_supp("-O quota") != 0) {
+ fprintf(stderr, "%s: \"-O quota\" is is not supported by "
+ "current e2fsprogs\n", progname);
+ return EINVAL;
+ }
+
+ dev = mop->mo_device;
+ if (mop->mo_flags & MO_IS_LOOP)
+ dev = mop->mo_loopdev;
+
+ /* Quota feature is already enabled? */
+ if (is_feature_enabled("quota", dev)) {
+ vprint("Quota feature is already enabled.\n");
+ return 0;
+ }
+
+ /* Turn on quota feature by "tune2fs -O quota" */
+ snprintf(cmd, cmdsz, "%s -O quota %s", TUNE2FS, dev);
+ ret = run_command(cmd, cmdsz);
+ if (ret)
+ fprintf(stderr, "command:%s (%d)", cmd, ret);
+
+ return ret;
+}
+
int ldiskfs_init(void)
{
/* Required because full path to DEBUGFS is not specified */