* GPL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*/
/*
#include <lustre/lustre_idl.h>
#include <lustre/liblustreapi.h>
#include <lustre/lustre_user.h>
+#include <lustre_quota.h>
#include <libcfs/libcfsutil.h>
#include "obdctl.h"
static int lfs_find(int argc, char **argv);
static int lfs_getstripe(int argc, char **argv);
static int lfs_osts(int argc, char **argv);
+static int lfs_mdts(int argc, char **argv);
static int lfs_df(int argc, char **argv);
+static int lfs_getname(int argc, char **argv);
static int lfs_check(int argc, char **argv);
static int lfs_catinfo(int argc, char **argv);
#ifdef HAVE_SYS_QUOTA_H
"Create a new file with a specific striping pattern or\n"
"set the default striping pattern on an existing directory or\n"
"delete the default striping pattern from an existing directory\n"
- "usage: setstripe [--size|-s stripe_size] [--offset|-o start_ost]\n"
- " [--count|-c stripe_count] [--pool|-p <pool>]\n"
- " <dir|filename>\n"
+ "usage: setstripe [--size|-s stripe_size] [--count|-c stripe_count]\n"
+ " [--index|-i|--offset|-o start_ost_index]\n"
+ " [--pool|-p <pool>] <directory|filename>\n"
" or \n"
- " setstripe -d <dir> (to delete default striping)\n"
+ " setstripe -d <directory> (to delete default striping)\n"
"\tstripe_size: Number of bytes on each OST (0 filesystem default)\n"
"\t Can be specified with k, m or g (in KB, MB and GB\n"
"\t respectively)\n"
- "\tstart_ost: OST index of first stripe (-1 filesystem default)\n"
+ "\tstart_ost_index: OST index of first stripe (-1 default)\n"
"\tstripe_count: Number of OSTs to stripe over (0 default, -1 all)\n"
- "\tpool: Name of OST pool"},
+ "\tpool: Name of OST pool to use (default none)"},
{"getstripe", lfs_getstripe, 0,
"To list the striping info for a given file or files in a\n"
"directory or recursively for all files in a directory tree.\n"
"usage: getstripe [--obd|-O <uuid>] [--quiet | -q] [--verbose | -v]\n"
- " [--count | -c ] [--size | -s ] [--index | -i ]\n"
- " [--offset | -o ] [--pool | -p ]\n"
- " [--recursive | -r] <dir|file> ..."},
+ " [--count | -c ] [--index | -i | --offset | -o]\n"
+ " [--size | -s ] [--pool | -p ] [--directory | -d]\n"
+ " [--mdt | -M] [--recursive | -r] [--raw | -R]\n"
+ " <directory|filename> ..."},
{"pool_list", lfs_poollist, 0,
"List pools or pool OSTs\n"
"usage: pool_list <fsname>[.<pool>] | <pathname>\n"},
{"find", lfs_find, 0,
"To find files that match given parameters recursively in a directory tree.\n"
- "usage: find <dir|file> ... \n"
+ "usage: find <directory|filename> ...\n"
" [[!] --atime|-A [+-]N] [[!] --mtime|-M [+-]N] [[!] --ctime|-C [+-]N]\n"
" [--maxdepth|-D N] [[!] --name|-n <pattern>] [--print0|-P]\n"
- " [--print|-p] [--obd|-O <uuid[s]>] [[!] --size|-s [+-]N[bkMGTP]]\n"
- " [[!] --type|-t <filetype>] [[!] --gid|-g|--group|-G <gid>|<gname>]\n"
+ " [--print|-p] [[!] --obd|-O <uuid[s]>] [[!] --mdt|-m <uuid[s]]\n"
+ " [[!] --size|-s [+-]N[bkMGTP]] [[!] --type|-t <filetype>]\n"
+ " [[!] --gid|-g|--group|-G <gid>|<gname>]\n"
" [[!] --uid|-u|--user|-U <uid>|<uname>]\n"
" [[!] --pool <pool>]\n"
"\t !: used before an option indicates 'NOT' the requested attribute\n"
"\tkeywords are one of followings: config, deletions.\n"
"\tnode name must be provided when use keyword config."},
{"join", lfs_join, 0,
- "join two lustre files into one - join A, B, will be like cat B >> A & del B\n"
- "usage: join <filename_A> <filename_B>\n"},
- {"osts", lfs_osts, 0, "osts"},
+ "join two lustre files into one.\n"
+ "obsolete, HEAD does not support it anymore.\n"},
+ {"osts", lfs_osts, 0, "list OSTs connected to client "
+ "[for specified path only]\n" "usage: osts [path]"},
+ {"mdts", lfs_mdts, 0, "list MDTs connected to client "
+ "[for specified path only]\n" "usage: mdts [path]"},
{"df", lfs_df, 0,
"report filesystem disk space usage or inodes usage"
"of each MDS and all OSDs or a batch belonging to a specific pool .\n"
"Usage: df [-i] [-h] [--pool|-p <fsname>[.<pool>] [path]"},
+ {"getname", lfs_getname, 0, "list instances and specified mount points "
+ "[for specified path only]\n"
+ "Usage: getname [-h]|[path ...] "},
#ifdef HAVE_SYS_QUOTA_H
{"quotachown",lfs_quotachown, 0,
"Change files' owner or group on the specified filesystem.\n"
" -i can be used instead of --inode-softlimit/--inode-grace\n"
" -I can be used instead of --inode-hardlimit"},
{"quota", lfs_quota, 0, "Display disk usage and limits.\n"
- "usage: quota [-v] [-o obd_uuid|-i mdt_idx|-I ost_idx]\n"
+ "usage: quota [-q] [-v] [-o <obd_uuid>|-i <mdt_idx>|-I <ost_idx>]\n"
" [<-u|-g> <uname>|<uid>|<gname>|<gid>] <filesystem>\n"
- " quota [-o obd_uuid|-i mdt_idx|-I ost_idx] -t <-u|-g> <filesystem>"},
+ " quota [-o <obd_uuid>|-i <mdt_idx>|-I <ost_idx>] -t <-u|-g> <filesystem>"},
{"quotainv", lfs_quotainv, 0, "Invalidate quota data.\n"
"usage: quotainv [-u|-g] <filesystem>"},
#endif
"usage: ls [OPTION]... [FILE]..."},
{"changelog", lfs_changelog, 0,
"Show the metadata changes on an MDT."
- "\nusage: changelog [--follow] <mdtname> [startrec [endrec]]"
- "\n(note: --follow is only valid when run on MDT node)"},
+ "\nusage: changelog <mdtname> [startrec [endrec]]"},
{"changelog_clear", lfs_changelog_clear, 0,
"Indicate that old changelog records up to <endrec> are no longer of "
"interest to consumer <id>, allowing the system to free up space.\n"
char *stripe_off_arg = NULL;
char *stripe_count_arg = NULL;
char *pool_name_arg = NULL;
- unsigned long long size_units;
+ unsigned long long size_units = 1;
struct option long_opts[] = {
- {"size", required_argument, 0, 's'},
{"count", required_argument, 0, 'c'},
+ {"delete", no_argument, 0, 'd'},
{"index", required_argument, 0, 'i'},
{"offset", required_argument, 0, 'o'},
{"pool", required_argument, 0, 'p'},
- {"delete", no_argument, 0, 'd'},
+ {"size", required_argument, 0, 's'},
{0, 0, 0, 0}
};
st_offset = -1;
st_count = 0;
-#if LUSTRE_VERSION < OBD_OCD_VERSION(2,1,0,0)
+#if LUSTRE_VERSION < OBD_OCD_VERSION(2,4,50,0)
if (argc == 5 && argv[1][0] != '-' &&
isnumber(argv[2]) && isnumber(argv[3]) && isnumber(argv[4])) {
- fprintf(stderr, "warning: deprecated usage of setstripe "
+ fprintf(stderr, "error: obsolete usage of setstripe "
"positional parameters. Use -c, -i, -s instead.\n");
- /* for compatibility with the existing positional parameter
- * usage */
- fname = argv[1];
- stripe_size_arg = argv[2];
- stripe_off_arg = argv[3];
- stripe_count_arg = argv[4];
- optind = 4;
+ return CMD_HELP;
} else
#else
#warning "remove obsolete positional parameter code"
#endif
{
optind = 0;
- while ((c = getopt_long(argc, argv, "c:di:o:s:p:",
+ while ((c = getopt_long(argc, argv, "c:di:o:p:s:",
long_opts, NULL)) >= 0) {
switch (c) {
case 0:
}
/* get the stripe offset */
if (stripe_off_arg != NULL) {
- st_offset = strtoul(stripe_off_arg, &end, 0);
+ st_offset = strtol(stripe_off_arg, &end, 0);
if (*end != '\0') {
fprintf(stderr, "error: %s: bad stripe offset '%s'\n",
argv[0], stripe_off_arg);
int new_fashion = 1;
int c, ret;
time_t t;
- struct find_param param = { .maxdepth = -1 };
- char str[1024];
+ struct find_param param = { .maxdepth = -1, .size_units = 0 };
struct option long_opts[] = {
- /* New find options. */
{"atime", required_argument, 0, 'A'},
{"ctime", required_argument, 0, 'C'},
- {"mtime", required_argument, 0, 'M'},
{"maxdepth", required_argument, 0, 'D'},
{"gid", required_argument, 0, 'g'},
{"group", required_argument, 0, 'G'},
- {"uid", required_argument, 0, 'u'},
- {"user", required_argument, 0, 'U'},
+ {"mtime", required_argument, 0, 'M'},
+ {"mdt", required_argument, 0, 'm'},
{"name", required_argument, 0, 'n'},
- /* no short option for pool, p/P already used */
- {"pool", required_argument, 0, FIND_POOL_OPT},
/* --obd is considered as a new option. */
{"obd", required_argument, 0, 'O'},
{"ost", required_argument, 0, 'O'},
- {"print", no_argument, 0, 'P'},
+ /* no short option for pool, p/P already used */
+ {"pool", required_argument, 0, FIND_POOL_OPT},
{"print0", no_argument, 0, 'p'},
- /* Old find options. */
+ {"print", no_argument, 0, 'P'},
{"quiet", no_argument, 0, 'q'},
{"recursive", no_argument, 0, 'r'},
{"size", required_argument, 0, 's'},
{"type", required_argument, 0, 't'},
+ {"uid", required_argument, 0, 'u'},
+ {"user", required_argument, 0, 'U'},
{"verbose", no_argument, 0, 'v'},
{0, 0, 0, 0}
};
optind = 0;
/* when getopt_long_only() hits '!' it returns 1, puts "!" in optarg */
- while ((c = getopt_long_only(argc,argv,"-A:C:D:g:G:M:n:PpO:qrs:t:u:U:v",
- long_opts, NULL)) >= 0) {
+ while ((c = getopt_long_only(argc, argv, "-A:C:D:g:G:M:m:n:O:"
+ "Ppqrs:t:u:U:v", long_opts, NULL)) >= 0) {
xtime = NULL;
xsign = NULL;
if (neg_opt)
fprintf(stderr, "err: %s: filename|dirname must either "
"precede options or follow options\n",
argv[0]);
- return CMD_HELP;
+ ret = CMD_HELP;
+ goto err;
}
if (!isoption && pathstart == -1)
pathstart = optind - 1;
case 'A':
xtime = ¶m.atime;
xsign = ¶m.asign;
+ param.exclude_atime = !!neg_opt;
case 'C':
if (c == 'C') {
xtime = ¶m.ctime;
xsign = ¶m.csign;
+ param.exclude_ctime = !!neg_opt;
}
case 'M':
if (c == 'M') {
xtime = ¶m.mtime;
xsign = ¶m.msign;
+ param.exclude_mtime = !!neg_opt;
}
new_fashion = 1;
- if (neg_opt) {
- if (optarg[0] == '-')
- optarg[0] = '+';
- else if (optarg[0] == '+')
- optarg[0] = '-';
- else {
- str[0] = '-';
- str[1] = '\0';
- strcat(str, optarg);
- optarg = str;
- }
- }
ret = set_time(&t, xtime, optarg);
- if (ret == INT_MAX)
- return -1;
+ if (ret == INT_MAX) {
+ ret = -1;
+ goto err;
+ }
if (ret)
*xsign = ret;
break;
if (*endptr != '\0') {
fprintf(stderr, "Group/GID: %s cannot "
"be found.\n", optarg);
- return -1;
+ ret = -1;
+ goto err;
}
- }
+ }
param.exclude_gid = !!neg_opt;
param.check_gid = 1;
break;
if (*endptr != '\0') {
fprintf(stderr, "User/UID: %s cannot "
"be found.\n", optarg);
- return -1;
+ ret = -1;
+ goto err;
}
}
param.exclude_uid = !!neg_opt;
"Pool name %s is too long"
" (max is %d)\n", optarg,
LOV_MAXPOOLNAME);
- return -1;
+ ret = -1;
+ goto err;
}
/* we do check for empty pool because empty pool
* is used to find V1 lov attributes */
param.pattern = (char *)optarg;
param.exclude_pattern = !!neg_opt;
break;
+ case 'm':
case 'O': {
char *buf, *token, *next, *p;
- int len;
-
- len = strlen((char *)optarg);
- buf = malloc(len+1);
- if (buf == NULL)
- return -ENOMEM;
- strcpy(buf, (char *)optarg);
-
- if (param.num_alloc_obds == 0) {
- param.obduuid = malloc(FIND_MAX_OSTS *
- sizeof(struct obd_uuid));
- if (param.obduuid == NULL)
- return -ENOMEM;
- param.num_alloc_obds = INIT_ALLOC_NUM_OSTS;
+ int len = 1;
+ void *tmp;
+
+ buf = strdup(optarg);
+ if (buf == NULL) {
+ ret = -ENOMEM;
+ goto err;
}
+ param.exclude_obd = !!neg_opt;
+
+ token = buf;
+ while (token && *token) {
+ token = strchr(token, ',');
+ if (token) {
+ len++;
+ token++;
+ }
+ }
+ if (c == 'O') {
+ param.exclude_obd = !!neg_opt;
+ param.num_alloc_obds += len;
+ tmp = realloc(param.obduuid,
+ param.num_alloc_obds *
+ sizeof(*param.obduuid));
+ if (tmp == NULL)
+ GOTO(err_free, ret = -ENOMEM);
+ param.obduuid = tmp;
+ } else {
+ param.exclude_mdt = !!neg_opt;
+ param.num_alloc_mdts += len;
+ tmp = realloc(param.mdtuuid,
+ param.num_alloc_mdts *
+ sizeof(*param.mdtuuid));
+ if (tmp == NULL)
+ GOTO(err_free, ret = -ENOMEM);
+ param.mdtuuid = tmp;
+ }
for (token = buf; token && *token; token = next) {
+ char *uuid;
+ if (c == 'O')
+ uuid =
+ param.obduuid[param.num_obds++].uuid;
+ else
+ uuid =
+ param.mdtuuid[param.num_mdts++].uuid;
p = strchr(token, ',');
next = 0;
if (p) {
*p = 0;
next = p+1;
}
- strcpy((char *)¶m.obduuid[param.num_obds++].uuid,
- token);
+ strcpy((char *)uuid, token);
}
-
+err_free:
if (buf)
free(buf);
break;
#endif
default: fprintf(stderr, "error: %s: bad type '%s'\n",
argv[0], optarg);
- return CMD_HELP;
+ ret = CMD_HELP;
+ goto err;
};
break;
case 's':
- if (neg_opt) {
- if (optarg[0] == '-')
- optarg[0] = '+';
- else if (optarg[0] == '+')
- optarg[0] = '-';
- else {
- str[0] = '-';
- str[1] = '\0';
- strcat(str, optarg);
- optarg = str;
- }
- }
if (optarg[0] == '+')
param.size_sign = -1;
else if (optarg[0] == '-')
if (ret) {
fprintf(stderr,"error: bad size '%s'\n",
optarg);
- return ret;
+ goto err;
}
+ param.check_size = 1;
+ param.exclude_size = !!neg_opt;
break;
case 'v':
new_fashion = 0;
param.quiet = 0;
break;
case '?':
- return CMD_HELP;
+ ret = CMD_HELP;
+ goto err;
default:
fprintf(stderr, "error: %s: option '%s' unrecognized\n",
argv[0], argv[optind - 1]);
- return CMD_HELP;
+ ret = CMD_HELP;
+ goto err;
};
}
if (pathstart == -1) {
fprintf(stderr, "error: %s: no filename|pathname\n",
argv[0]);
- return CMD_HELP;
+ ret = CMD_HELP;
+ goto err;
} else if (pathend == -1) {
/* no options */
pathend = argc;
if (ret)
fprintf(stderr, "error: %s failed for %s.\n",
argv[0], argv[optind - 1]);
-
+err:
if (param.obduuid && param.num_alloc_obds)
free(param.obduuid);
+ if (param.mdtuuid && param.num_alloc_mdts)
+ free(param.mdtuuid);
+
return ret;
}
static int lfs_getstripe(int argc, char **argv)
{
struct option long_opts[] = {
- {"obd", 1, 0, 'O'},
- {"quiet", 0, 0, 'q'},
- {"recursive", 0, 0, 'r'},
{"count", 0, 0, 'c'},
- {"size", 0, 0, 's'},
+ {"directory", 0, 0, 'd'},
+ {"generation", 0, 0, 'g'},
{"index", 0, 0, 'i'},
+ {"mdt", 0, 0, 'M'},
{"offset", 0, 0, 'o'},
+ {"obd", 1, 0, 'O'},
{"pool", 0, 0, 'p'},
+ {"quiet", 0, 0, 'q'},
+ {"recursive", 0, 0, 'r'},
+ {"raw", 0, 0, 'R'},
+ {"size", 0, 0, 's'},
{"verbose", 0, 0, 'v'},
{0, 0, 0, 0}
};
- char short_opts[] = "hO:qrvcsiop";
int c, rc;
struct find_param param = { 0 };
+ param.maxdepth = 1;
optind = 0;
- while ((c = getopt_long(argc, argv, short_opts,
+ while ((c = getopt_long(argc, argv, "cdghiMoO:pqrRsv",
long_opts, NULL)) != -1) {
switch (c) {
case 'O':
case 'q':
param.quiet++;
break;
+ case 'd':
+ param.maxdepth = 0;
+ break;
case 'r':
param.recursive = 1;
break;
case 'v':
param.verbose = VERBOSE_ALL | VERBOSE_DETAIL;
- param.quiet = 0;
break;
case 'c':
- param.verbose |= VERBOSE_COUNT;
+ if (!(param.verbose & VERBOSE_DETAIL)) {
+ param.verbose |= VERBOSE_COUNT;
+ param.maxdepth = 0;
+ }
break;
case 's':
- param.verbose |= VERBOSE_SIZE;
+ if (!(param.verbose & VERBOSE_DETAIL)) {
+ param.verbose |= VERBOSE_SIZE;
+ param.maxdepth = 0;
+ }
break;
case 'i':
case 'o':
- param.verbose |= VERBOSE_OFFSET;
+ if (!(param.verbose & VERBOSE_DETAIL)) {
+ param.verbose |= VERBOSE_OFFSET;
+ param.maxdepth = 0;
+ }
break;
case 'p':
- param.verbose |= VERBOSE_POOL;
+ if (!(param.verbose & VERBOSE_DETAIL)) {
+ param.verbose |= VERBOSE_POOL;
+ param.maxdepth = 0;
+ }
+ break;
+ case 'g':
+ if (!(param.verbose & VERBOSE_DETAIL)) {
+ param.verbose |= VERBOSE_GENERATION;
+ param.maxdepth = 0;
+ }
+ break;
+ case 'M':
+ if (!(param.verbose & VERBOSE_DETAIL))
+ param.maxdepth = 0;
+ param.get_mdt_index = 1;
+ break;
+ case 'R':
+ param.raw = 1;
break;
case '?':
return CMD_HELP;
if (optind >= argc)
return CMD_HELP;
- param.maxdepth = param.recursive ? -1 : 1;
+ if (param.recursive)
+ param.maxdepth = -1;
+
+ if (!param.verbose)
+ param.verbose = VERBOSE_ALL;
+ if (param.quiet)
+ param.verbose = VERBOSE_OBJID;
do {
rc = llapi_getstripe(argv[optind], ¶m);
return rc;
}
-static int lfs_osts(int argc, char **argv)
+static int lfs_tgts(int argc, char **argv)
{
- char mntdir[PATH_MAX] = {'\0'};
+ char mntdir[PATH_MAX] = {'\0'}, path[PATH_MAX] = {'\0'};
struct find_param param;
int index = 0, rc=0;
- if (argc != 1)
+ if (argc > 2)
return CMD_HELP;
- while (llapi_search_mounts(NULL, index++, mntdir, NULL) == 0) {
+ if (argc == 2 && !realpath(argv[1], path)) {
+ rc = -errno;
+ fprintf(stderr, "error: invalid path '%s': %s\n",
+ argv[1], strerror(-rc));
+ return rc;
+ }
+
+ while (!llapi_search_mounts(path, index++, mntdir, NULL)) {
+ /* Check if we have a mount point */
+ if (mntdir[0] == '\0')
+ continue;
+
memset(¶m, 0, sizeof(param));
- rc = llapi_getstripe(mntdir, ¶m);
+ if (!strcmp(argv[0], "mdts"))
+ param.get_lmv = 1;
+
+ rc = llapi_ostlist(mntdir, ¶m);
if (rc) {
fprintf(stderr, "error: %s: failed on %s\n",
argv[0], mntdir);
}
+ if (path[0] != '\0')
+ break;
memset(mntdir, 0, PATH_MAX);
}
return rc;
}
+static int lfs_osts(int argc, char **argv)
+{
+ return lfs_tgts(argc, argv);
+}
+
+static int lfs_mdts(int argc, char **argv)
+{
+ return lfs_tgts(argc, argv);
+}
+
#define COOK(value) \
({ \
int radix = 0; \
radix; \
})
#define UUF "%-20s"
-#define CSF "%9s"
-#define CDF "%9llu"
-#define HSF "%8s"
-#define HDF "%6.1f"
-#define RSF "%5s"
-#define RDF "%4d%%"
+#define CSF "%11s"
+#define CDF "%11llu"
+#define HDF "%8.1f%c"
+#define RSF "%4s"
+#define RDF "%3d%%"
static int showdf(char *mntdir, struct obd_statfs *stat,
char *uuid, int ishow, int cooked,
total = (stat->os_blocks * stat->os_bsize) >> shift;
}
- if (total > 0)
- ratio = (double)used / (double)total;
+ if ((used + avail) > 0)
+ ratio = (double)used / (double)(used + avail);
if (cooked) {
int i;
cook_val = (double)total;
i = COOK(cook_val);
if (i > 0)
- sprintf(tbuf, HDF"%c", cook_val, suffix[i - 1]);
+ sprintf(tbuf, HDF, cook_val, suffix[i - 1]);
else
sprintf(tbuf, CDF, total);
cook_val = (double)used;
i = COOK(cook_val);
if (i > 0)
- sprintf(ubuf, HDF"%c", cook_val, suffix[i - 1]);
+ sprintf(ubuf, HDF, cook_val, suffix[i - 1]);
else
sprintf(ubuf, CDF, used);
cook_val = (double)avail;
i = COOK(cook_val);
if (i > 0)
- sprintf(abuf, HDF"%c", cook_val, suffix[i - 1]);
+ sprintf(abuf, HDF, cook_val, suffix[i - 1]);
else
sprintf(abuf, CDF, avail);
} else {
sprintf(abuf, CDF, avail);
}
- sprintf(rbuf, RDF, (int)(ratio * 100));
+ sprintf(rbuf, RDF, (int)(ratio * 100 + 0.5));
printf(UUF" "CSF" "CSF" "CSF" "RSF" %-s",
uuid, tbuf, ubuf, abuf, rbuf, mntdir);
if (type)
return 0;
}
+struct ll_stat_type {
+ int st_op;
+ char *st_name;
+};
+
static int mntdf(char *mntdir, char *fsname, char *pool, int ishow, int cooked)
{
struct obd_statfs stat_buf, sum = { .os_bsize = 1 };
struct obd_uuid uuid_buf;
char *poolname = NULL;
+ struct ll_stat_type types[] = { { LL_STATFS_LMV, "MDT" },
+ { LL_STATFS_LOV, "OST" },
+ { 0, NULL } };
+ struct ll_stat_type *tp;
__u32 index;
int rc;
"UUID", cooked ? "bytes" : "1K-blocks",
"Used", "Available", "Use%", "Mounted on");
- for (index = 0; ; index++) {
- memset(&stat_buf, 0, sizeof(struct obd_statfs));
- memset(&uuid_buf, 0, sizeof(struct obd_uuid));
- rc = llapi_obd_statfs(mntdir, LL_STATFS_MDC, index,
- &stat_buf, &uuid_buf);
- if (rc == -ENODEV)
- break;
-
- if (rc == -EAGAIN)
- continue;
-
- if (rc == -ENOTCONN || rc == -ETIMEDOUT || rc == -EIO ||
- rc == -ENODATA || rc == 0) {
- showdf(mntdir, &stat_buf, obd_uuid2str(&uuid_buf),
- ishow, cooked, "MDT", index, rc);
- } else {
- fprintf(stderr,
- "error: llapi_obd_statfs(%s): %s (%d)\n",
- obd_uuid2str(&uuid_buf), strerror(-rc), rc);
- return rc;
- }
- if (rc == 0) {
- sum.os_ffree += stat_buf.os_ffree;
- sum.os_files += stat_buf.os_files;
- }
- }
-
- for (index = 0; ; index++) {
- memset(&stat_buf, 0, sizeof(struct obd_statfs));
- memset(&uuid_buf, 0, sizeof(struct obd_uuid));
- rc = llapi_obd_statfs(mntdir, LL_STATFS_LOV, index,
- &stat_buf, &uuid_buf);
- if (rc == -ENODEV)
- break;
-
- if (rc == -EAGAIN)
- continue;
+ for (tp = types; tp->st_name != NULL; tp++) {
+ for (index = 0; ; index++) {
+ memset(&stat_buf, 0, sizeof(struct obd_statfs));
+ memset(&uuid_buf, 0, sizeof(struct obd_uuid));
+ rc = llapi_obd_statfs(mntdir, tp->st_op, index,
+ &stat_buf, &uuid_buf);
+ if (rc == -ENODEV)
+ break;
- if (llapi_search_ost(fsname, poolname,
- obd_uuid2str(&uuid_buf)) != 1)
- continue;
+ if (poolname && tp->st_op == LL_STATFS_LOV &&
+ llapi_search_ost(fsname, poolname,
+ obd_uuid2str(&uuid_buf)) != 1)
+ continue;
- if (rc == -ENOTCONN || rc == -ETIMEDOUT || rc == -EIO ||
- rc == -ENODATA || rc == 0) {
- showdf(mntdir, &stat_buf, obd_uuid2str(&uuid_buf),
- ishow, cooked, "OST", index, rc);
- } else {
- fprintf(stderr,
- "error: llapi_obd_statfs failed: %s (%d)\n",
- strerror(-rc), rc);
- return rc;
- }
- if (rc == 0) {
- sum.os_blocks += stat_buf.os_blocks * stat_buf.os_bsize;
- sum.os_bfree += stat_buf.os_bfree * stat_buf.os_bsize;
- sum.os_bavail += stat_buf.os_bavail * stat_buf.os_bsize;
+ /* the llapi_obd_statfs() call may have returned with
+ * an error, but if it filled in uuid_buf we will at
+ * lease use that to print out a message for that OBD.
+ * If we didn't get anything in the uuid_buf, then fill
+ * it in so that we can print an error message. */
+ if (uuid_buf.uuid[0] == '\0')
+ sprintf(uuid_buf.uuid, "%s%04x",
+ tp->st_name, index);
+ showdf(mntdir,&stat_buf,obd_uuid2str(&uuid_buf),
+ ishow, cooked, tp->st_name, index, rc);
+
+ if (rc == 0) {
+ if (tp->st_op == LL_STATFS_LMV) {
+ sum.os_ffree += stat_buf.os_ffree;
+ sum.os_files += stat_buf.os_files;
+ } else /* if (tp->st_op == LL_STATFS_LOV) */ {
+ sum.os_blocks += stat_buf.os_blocks *
+ stat_buf.os_bsize;
+ sum.os_bfree += stat_buf.os_bfree *
+ stat_buf.os_bsize;
+ sum.os_bavail += stat_buf.os_bavail *
+ stat_buf.os_bsize;
+ }
+ } else if (rc == -EINVAL || rc == -EFAULT) {
+ break;
+ }
}
}
printf("\n");
showdf(mntdir, &sum, "filesystem summary:", ishow, cooked, NULL, 0,0);
-
+ printf("\n");
return 0;
}
static int lfs_df(int argc, char **argv)
{
- char *path = NULL;
- char *mntdir = NULL;
+ char mntdir[PATH_MAX] = {'\0'}, path[PATH_MAX] = {'\0'};
int ishow = 0, cooked = 0;
- int c, rc = 0;
- char fsname[PATH_MAX], *pool_name = NULL;
+ int c, rc = 0, index = 0;
+ char fsname[PATH_MAX] = "", *pool_name = NULL;
struct option long_opts[] = {
{"pool", required_argument, 0, 'p'},
{0, 0, 0, 0}
};
optind = 0;
- while ((c = getopt_long(argc, argv, "ihp:", long_opts, NULL)) != -1) {
+ while ((c = getopt_long(argc, argv, "hip:", long_opts, NULL)) != -1) {
switch (c) {
case 'i':
ishow = 1;
return CMD_HELP;
}
}
- if (optind < argc )
- path = argv[optind];
+ if (optind < argc && !realpath(argv[optind], path)) {
+ rc = -errno;
+ fprintf(stderr, "error: invalid path '%s': %s\n",
+ argv[optind], strerror(-rc));
+ return rc;
+ }
- if ((mntdir = malloc(PATH_MAX)) == NULL) {
- fprintf(stderr, "error: cannot allocate %d bytes\n",
- PATH_MAX);
- return -ENOMEM;
+ while (!llapi_search_mounts(path, index++, mntdir, fsname)) {
+ /* Check if we have a mount point */
+ if (mntdir[0] == '\0')
+ continue;
+
+ rc = mntdf(mntdir, fsname, pool_name, ishow, cooked);
+ if (rc || path[0] != '\0')
+ break;
+ fsname[0] = '\0'; /* avoid matching in next loop */
+ mntdir[0] = '\0'; /* avoid matching in next loop */
}
- memset(mntdir, 0, PATH_MAX);
- if (path) {
- char rpath[PATH_MAX] = {'\0'};
+ return rc;
+}
- if (!realpath(path, rpath)) {
- rc = -errno;
- fprintf(stderr, "error: invalid path '%s': %s\n",
- path, strerror(-rc));
- } else {
- rc = llapi_search_mounts(rpath, 0, mntdir, fsname);
- if (rc == 0 && mntdir[0] != '\0') {
- rc = mntdf(mntdir, fsname, pool_name,
- ishow, cooked);
- printf("\n");
+static int lfs_getname(int argc, char **argv)
+{
+ char mntdir[PATH_MAX] = "", path[PATH_MAX] = "", fsname[PATH_MAX] = "";
+ int rc = 0, index = 0, c;
+ char buf[sizeof(struct obd_uuid)];
+
+ optind = 0;
+ while ((c = getopt(argc, argv, "h")) != -1)
+ return CMD_HELP;
+
+ if (optind == argc) { /* no paths specified, get all paths. */
+ while (!llapi_search_mounts(path, index++, mntdir, fsname)) {
+ rc = llapi_getname(mntdir, buf, sizeof(buf));
+ if (rc < 0) {
+ fprintf(stderr,
+ "cannot get name for `%s': %s\n",
+ mntdir, strerror(-rc));
+ break;
}
- }
- } else {
- int index = 0;
- while (llapi_search_mounts(NULL, index++, mntdir, fsname)==0) {
- rc = mntdf(mntdir, fsname, pool_name,
- ishow, cooked);
- if (rc)
+ printf("%s %s\n", buf, mntdir);
+
+ path[0] = fsname[0] = mntdir[0] = 0;
+ }
+ } else { /* paths specified, only attempt to search these. */
+ for (; optind < argc; optind++) {
+ rc = llapi_getname(argv[optind], buf, sizeof(buf));
+ if (rc < 0) {
+ fprintf(stderr,
+ "cannot get name for `%s': %s\n",
+ argv[optind], strerror(-rc));
break;
- printf("\n");
+ }
+
+ printf("%s %s\n", buf, argv[optind]);
}
}
-
- free(mntdir);
return rc;
}
return rc;
}
-int lfs_join(int argc, char **argv)
+static int lfs_join(int argc, char **argv)
{
- char *name_head, *name_tail;
- int fd, rc;
- loff_t size;
-
- if (argc != 3)
- return CMD_HELP;
- name_head = argv[1];
- fd = open(name_head, O_WRONLY);
- if (fd < 0) {
- fprintf(stderr, "Can not open name_head %s rc=%d\n",
- name_head, fd);
- return fd;
- }
- size = lseek(fd, 0, SEEK_END);
- if (size % JOIN_FILE_ALIGN) {
- fprintf(stderr,"head file %s size %llu must be mutiple of %d\n",
- name_head, (long long)size, JOIN_FILE_ALIGN);
- rc = -EINVAL;
- goto out;
- }
- name_tail = argv[2];
- rc = ioctl(fd, LL_IOC_JOIN, name_tail);
-out:
- close(fd);
- if (rc) {
- fprintf(stderr, "Lustre joining files: %s, %s, failed\n",
- argv[1], argv[2]);
- }
- return rc;
+ fprintf(stderr, "join two lustre files into one.\n"
+ "obsolete, HEAD does not support it anymore.\n");
+ return 0;
}
#ifdef HAVE_SYS_QUOTA_H
memset(&qchk, 0, sizeof(qchk));
optind = 0;
- while ((c = getopt(argc, argv, "ug")) != -1) {
+ while ((c = getopt(argc, argv, "gu")) != -1) {
switch (c) {
case 'u':
check_type |= 0x01;
rc = llapi_quotacheck(mnt, check_type);
if (rc) {
- fprintf(stderr, "quotacheck failed: %s\n", strerror(errno));
+ fprintf(stderr, "quotacheck failed: %s\n", strerror(-rc));
return rc;
}
if (*obd_type)
fprintf(stderr, "%s %s ", obd_type,
obd_uuid2str(&qchk.obd_uuid));
- fprintf(stderr, "quota check failed: %s\n", strerror(errno));
+ fprintf(stderr, "quota check failed: %s\n", strerror(-rc));
return rc;
}
qctl.qc_cmd = LUSTRE_Q_QUOTAON;
qctl.qc_type = check_type;
rc = llapi_quotactl(mnt, &qctl);
- if (rc && errno != EALREADY) {
+ if (rc && rc != -EALREADY) {
if (*obd_type)
fprintf(stderr, "%s %s ", (char *)qctl.obd_type,
obd_uuid2str(&qctl.obd_uuid));
fprintf(stderr, "%s turn on quota failed: %s\n",
- argv[0], strerror(errno));
+ argv[0], strerror(-rc));
return rc;
}
qctl.qc_cmd = LUSTRE_Q_QUOTAON;
optind = 0;
- while ((c = getopt(argc, argv, "ugf")) != -1) {
+ while ((c = getopt(argc, argv, "fgu")) != -1) {
switch (c) {
case 'u':
qctl.qc_type |= 0x01;
rc = llapi_quotactl(mnt, &qctl);
if (rc) {
- if (errno == EALREADY) {
- fprintf(stderr, "\n%s quotas are enabled already.\n",
- qctl.qc_type == 0x02 ? "user/group" :
- (qctl.qc_type == 0x00 ? "user" : "group"));
+ if (rc == -EALREADY) {
rc = 0;
- } else if (errno == ENOENT) {
+ } else if (rc == -ENOENT) {
fprintf(stderr, "error: cannot find quota database, "
"make sure you have run quotacheck\n");
} else {
fprintf(stderr, "%s %s ", obd_type,
obd_uuid2str(&qctl.obd_uuid));
fprintf(stderr, "%s failed: %s\n", argv[0],
- strerror(errno));
+ strerror(-rc));
}
}
qctl.qc_cmd = LUSTRE_Q_QUOTAOFF;
optind = 0;
- while ((c = getopt(argc, argv, "ug")) != -1) {
+ while ((c = getopt(argc, argv, "gu")) != -1) {
switch (c) {
case 'u':
qctl.qc_type |= 0x01;
rc = llapi_quotactl(mnt, &qctl);
if (rc) {
- if (errno == EALREADY) {
- fprintf(stderr, "\n%s quotas are disabled already.\n",
- qctl.qc_type == 0x02 ? "user/group" :
- (qctl.qc_type == 0x00 ? "user" : "group"));
+ if (rc == -EALREADY) {
rc = 0;
} else {
if (*obd_type)
fprintf(stderr, "%s %s ", obd_type,
obd_uuid2str(&qctl.obd_uuid));
fprintf(stderr, "quotaoff failed: %s\n",
- strerror(errno));
+ strerror(-rc));
}
}
qctl.qc_cmd = LUSTRE_Q_INVALIDATE;
optind = 0;
- while ((c = getopt(argc, argv, "ugf")) != -1) {
+ while ((c = getopt(argc, argv, "fgu")) != -1) {
switch (c) {
case 'u':
qctl.qc_type |= 0x01;
rc = llapi_quotactl(mnt, &qctl);
if (rc) {
- fprintf(stderr, "quotainv failed: %s\n", strerror(errno));
+ fprintf(stderr, "quotainv failed: %s\n", strerror(-rc));
return rc;
}
* 2. specifiers may be encountered multiple times (2s3s is 5 seconds)
* 3. empty integer value is interpreted as 0
*/
-
-static unsigned long str2sec(const char* timestr) {
+static unsigned long str2sec(const char* timestr)
+{
const char spec[] = "smhdw";
const unsigned long mult[] = {1, 60, 60*60, 24*60*60, 7*24*60*60};
unsigned long val = 0;
return ULONG_MAX;
}
-#define ARG2ULL(nr, str, defscale) \
+#define ARG2ULL(nr, str, def_units) \
do { \
- unsigned long long limit, units = 0; \
+ unsigned long long limit, units = def_units; \
int rc; \
\
rc = parse_size(str, &limit, &units, 1); \
fprintf(stderr, "error: bad limit value %s\n", str); \
return CMD_HELP; \
} \
- nr = ((units == 0) ? (defscale) : 1) * limit; \
+ nr = limit; \
} while (0)
static inline int has_times_option(int argc, char **argv)
struct obd_dqblk *dqb = &qctl.qc_dqblk;
struct obd_dqinfo *dqi = &qctl.qc_dqinfo;
struct option long_opts[] = {
- {"user", no_argument, 0, 'u'},
- {"group", no_argument, 0, 'g'},
{"block-grace", required_argument, 0, 'b'},
+ {"group", no_argument, 0, 'g'},
{"inode-grace", required_argument, 0, 'i'},
{"times", no_argument, 0, 't'},
+ {"user", no_argument, 0, 'u'},
{0, 0, 0, 0}
};
qctl.qc_type = UGQUOTA;
optind = 0;
- while ((c = getopt_long(argc, argv, "ugb:i:t", long_opts, NULL)) != -1) {
+ while ((c = getopt_long(argc, argv, "b:gi:tu", long_opts, NULL)) != -1) {
switch (c) {
case 'u':
case 'g':
if (*obd_type)
fprintf(stderr, "%s %s ", obd_type,
obd_uuid2str(&qctl.obd_uuid));
- fprintf(stderr, "setquota failed: %s\n", strerror(errno));
+ fprintf(stderr, "setquota failed: %s\n", strerror(-rc));
return rc;
}
char *mnt, *obd_type = (char *)qctl.obd_type;
struct obd_dqblk *dqb = &qctl.qc_dqblk;
struct option long_opts[] = {
- {"user", required_argument, 0, 'u'},
- {"group", required_argument, 0, 'g'},
{"block-softlimit", required_argument, 0, 'b'},
{"block-hardlimit", required_argument, 0, 'B'},
+ {"group", required_argument, 0, 'g'},
{"inode-softlimit", required_argument, 0, 'i'},
{"inode-hardlimit", required_argument, 0, 'I'},
+ {"user", required_argument, 0, 'u'},
{0, 0, 0, 0}
};
unsigned limit_mask = 0;
* isn't reinitialized from command line */
optind = 0;
- while ((c = getopt_long(argc, argv, "u:g:b:B:i:I:", long_opts, NULL)) != -1) {
+ while ((c = getopt_long(argc, argv, "b:B:g:i:I:u:", long_opts, NULL)) != -1) {
switch (c) {
case 'u':
case 'g':
qctl.qc_id = strtoul(optarg, &endptr, 10);
if (*endptr != '\0') {
fprintf(stderr, "error: can't find id "
- "for name %s\n", optarg);
+ "for name %s\n", optarg);
return CMD_HELP;
}
}
if (rc < 0) {
fprintf(stderr, "error: setquota failed while retrieving"
" current quota settings (%s)\n",
- strerror(errno));
+ strerror(-rc));
return rc;
}
if (*obd_type)
fprintf(stderr, "%s %s ", obd_type,
obd_uuid2str(&qctl.obd_uuid));
- fprintf(stderr, "setquota failed: %s\n", strerror(errno));
+ fprintf(stderr, "setquota failed: %s\n", strerror(-rc));
return rc;
}
return "unknown";
}
-
/* Converts seconds value into format string
* result is returned in buf
* Notes:
* 2. zero fields are not filled (except for p. 3): 5d1s
* 3. zero seconds value is presented as "0s"
*/
-static void sec2str(time_t seconds, char *buf)
+static char * __sec2str(time_t seconds, char *buf)
{
const char spec[] = "smhdw";
const unsigned long mult[] = {1, 60, 60*60, 24*60*60, 7*24*60*60};
unsigned long c;
- char* tail = buf;
+ char *tail = buf;
int i;
for (i = sizeof(mult) / sizeof(mult[0]) - 1 ; i >= 0; i--) {
seconds %= mult[i];
}
+
+ return tail;
}
+static void sec2str(time_t seconds, char *buf, int rc)
+{
+ char *tail = buf;
+
+ if (rc)
+ *tail++ = '[';
+
+ tail = __sec2str(seconds, tail);
+
+ if (rc && tail - buf < 39) {
+ *tail++ = ']';
+ *tail++ = 0;
+ }
+}
static void diff2str(time_t seconds, char *buf, time_t now)
{
strcpy(buf, "none");
return;
}
- sec2str(seconds - now, buf);
+ __sec2str(seconds - now, buf);
}
static void print_quota_title(char *name, struct if_quotactl *qctl)
if (dqb->dqb_bhardlimit &&
toqb(dqb->dqb_curspace) >= dqb->dqb_bhardlimit) {
bover = 1;
- } else if (dqb->dqb_bsoftlimit &&
- toqb(dqb->dqb_curspace) >= dqb->dqb_bsoftlimit) {
+ } else if (dqb->dqb_bsoftlimit && dqb->dqb_btime) {
if (dqb->dqb_btime > now) {
bover = 2;
} else {
if (dqb->dqb_ihardlimit &&
dqb->dqb_curinodes >= dqb->dqb_ihardlimit) {
iover = 1;
- } else if (dqb->dqb_isoftlimit &&
- dqb->dqb_curinodes >= dqb->dqb_isoftlimit) {
+ } else if (dqb->dqb_isoftlimit && dqb->dqb_itime) {
if (dqb->dqb_btime > now) {
iover = 2;
} else {
if (bover)
diff2str(dqb->dqb_btime, timebuf, now);
- if (rc == -1 && errno == EREMOTEIO)
+ if (rc == -EREMOTEIO)
sprintf(numbuf[0], LPU64"*",
toqb(dqb->dqb_curspace));
else
? LPU64 : "["LPU64"]",
dqb->dqb_bsoftlimit);
else
- sprintf(numbuf[1], "%s", "");
+ sprintf(numbuf[1], "%s", "-");
sprintf(numbuf[2], (dqb->dqb_valid & QIF_BLIMITS)
? LPU64 : "["LPU64"]", dqb->dqb_bhardlimit);
printf(" %7s%c %6s %7s %7s",
numbuf[0], bover ? '*' : ' ', numbuf[1],
- numbuf[2], bover > 1 ? timebuf : "");
+ numbuf[2], bover > 1 ? timebuf : "-");
if (iover)
diff2str(dqb->dqb_itime, timebuf, now);
? LPU64 : "["LPU64"]",
dqb->dqb_isoftlimit);
else
- sprintf(numbuf[1], "%s", "");
+ sprintf(numbuf[1], "%s", "-");
sprintf(numbuf[2], (dqb->dqb_valid & QIF_ILIMITS) ?
LPU64 : "["LPU64"]", dqb->dqb_ihardlimit);
if (type != QC_OSTIDX)
printf(" %7s%c %6s %7s %7s",
numbuf[0], iover ? '*' : ' ', numbuf[1],
- numbuf[2], iover > 1 ? timebuf : "");
+ numbuf[2], iover > 1 ? timebuf : "-");
+ else
+ printf(" %7s %7s %7s %7s", "-", "-", "-", "-");
printf("\n");
}
} else if (qctl->qc_cmd == LUSTRE_Q_GETINFO ||
char bgtimebuf[40];
char igtimebuf[40];
- sec2str(qctl->qc_dqinfo.dqi_bgrace, bgtimebuf);
- sec2str(qctl->qc_dqinfo.dqi_igrace, igtimebuf);
+ sec2str(qctl->qc_dqinfo.dqi_bgrace, bgtimebuf, rc);
+ sec2str(qctl->qc_dqinfo.dqi_igrace, igtimebuf, rc);
printf("Block grace time: %s; Inode grace time: %s\n",
bgtimebuf, igtimebuf);
}
rc = llapi_get_obd_count(mnt, &count, is_mdt);
if (rc) {
fprintf(stderr, "can not get %s count: %s\n",
- is_mdt ? "mdt": "ost", strerror(errno));
+ is_mdt ? "mdt": "ost", strerror(-rc));
return rc;
}
rc = llapi_quotactl(mnt, qctl);
if (rc) {
/* It is remote client case. */
- if (errno == EOPNOTSUPP) {
+ if (-rc == EOPNOTSUPP) {
rc = 0;
goto out;
}
.qc_type = UGQUOTA };
char *obd_type = (char *)qctl.obd_type;
char *obd_uuid = (char *)qctl.obd_uuid.uuid;
- int rc, rc1 = 0, rc2 = 0, rc3 = 0, verbose = 0, pass = 0;
+ int rc, rc1 = 0, rc2 = 0, rc3 = 0,
+ verbose = 0, pass = 0, quiet = 0, inacc;
char *endptr;
__u32 valid = QC_GENERAL, idx = 0;
optind = 0;
- while ((c = getopt(argc, argv, "ugto:i:I:v")) != -1) {
+ while ((c = getopt(argc, argv, "gi:I:o:qtuv")) != -1) {
switch (c) {
case 'u':
if (qctl.qc_type != UGQUOTA) {
case 'v':
verbose = 1;
break;
+ case 'q':
+ quiet = 1;
+ break;
default:
fprintf(stderr, "error: %s: option '-%c' "
"unrecognized\n", argv[0], c);
return CMD_HELP;
}
- if (qctl.qc_cmd == LUSTRE_Q_GETQUOTA)
- print_quota_title(name, &qctl);
-
mnt = argv[optind];
rc1 = llapi_quotactl(mnt, &qctl);
- if (rc1 == -1 && errno == EALREADY) {
- fprintf(stderr, "\n%s quotas are not enabled.\n",
- qctl.qc_type == USRQUOTA ? "user" : "group");
- goto out;
+ if (rc1 < 0) {
+ switch (rc1) {
+ case -ESRCH:
+ fprintf(stderr, "%s quotas are not enabled.\n",
+ qctl.qc_type == USRQUOTA ? "user" : "group");
+ goto out;
+ case -EPERM:
+ fprintf(stderr, "Permission denied.\n");
+ case -ENOENT:
+ /* We already got a "No such file..." message. */
+ goto out;
+ default:
+ fprintf(stderr, "Unexpected quotactl error: %s\n",
+ strerror(-rc1));
+ }
}
+
+ if (qctl.qc_cmd == LUSTRE_Q_GETQUOTA && !quiet)
+ print_quota_title(name, &qctl);
+
if (rc1 && *obd_type)
fprintf(stderr, "%s %s ", obd_type, obd_uuid);
if (qctl.qc_valid != QC_GENERAL)
mnt = "";
+ inacc = (qctl.qc_cmd == LUSTRE_Q_GETQUOTA) &&
+ ((qctl.qc_dqblk.dqb_valid&(QIF_LIMITS|QIF_USAGE))!=(QIF_LIMITS|QIF_USAGE));
+
print_quota(mnt, &qctl, QC_GENERAL, rc1);
if (qctl.qc_valid == QC_GENERAL && qctl.qc_cmd != LUSTRE_Q_GETINFO && verbose) {
rc3 = print_obd_quota(mnt, &qctl, 0);
}
- if (rc1 || rc2 || rc3)
+ if (rc1 || rc2 || rc3 || inacc)
printf("Some errors happened when getting quota info. "
"Some devices may be not working or deactivated. "
"The data in \"[]\" is inaccurate.\n");
if (pass == 1)
goto ug_output;
- return 0;
+ return rc1;
}
#endif /* HAVE_SYS_QUOTA_H! */
}
}
- if (kdestroy)
- system("kdestroy > /dev/null");
+ if (kdestroy) {
+ int rc;
+ if ((rc = system("kdestroy > /dev/null")) != 0) {
+ rc = WEXITSTATUS(rc);
+ fprintf(stderr, "error destroying tickets: %d, continuing\n", rc);
+ }
+ }
if (optind >= argc) {
/* flush for all mounted lustre fs. */
endrec = strtoll(argv[optind++], NULL, 10);
rc = llapi_changelog_start(&changelog_priv,
- follow ? CHANGELOG_FLAG_FOLLOW : 0,
+ CHANGELOG_FLAG_BLOCK |
+ (follow ? CHANGELOG_FLAG_FOLLOW : 0),
mdd, startrec);
if (rc < 0) {
fprintf(stderr, "Can't start changelog: %s\n",
}
while ((rc = llapi_changelog_recv(changelog_priv, &rec)) == 0) {
- if (endrec && rec->cr_index > endrec)
+ time_t secs;
+ struct tm ts;
+
+ if (endrec && rec->cr_index > endrec) {
+ llapi_changelog_free(&rec);
break;
- if (rec->cr_index < startrec)
+ }
+ if (rec->cr_index < startrec) {
+ llapi_changelog_free(&rec);
continue;
+ }
- printf(LPU64" %02d%-5s "LPU64" 0x%x t="DFID,
- rec->cr_index, rec->cr_type,
- changelog_type2str(rec->cr_type), rec->cr_time,
+ secs = rec->cr_time >> 30;
+ gmtime_r(&secs, &ts);
+ printf(LPU64" %02d%-5s %02d:%02d:%02d.%06d %04d.%02d.%02d "
+ "0x%x t="DFID, rec->cr_index, rec->cr_type,
+ changelog_type2str(rec->cr_type),
+ ts.tm_hour, ts.tm_min, ts.tm_sec,
+ (int)(rec->cr_time & ((1<<30) - 1)),
+ ts.tm_year+1900, ts.tm_mon+1, ts.tm_mday,
rec->cr_flags & CLF_FLAGMASK, PFID(&rec->cr_tfid));
if (rec->cr_namelen)
/* namespace rec includes parent and filename */
rec->cr_namelen, rec->cr_name);
else
printf("\n");
+
llapi_changelog_free(&rec);
}
llapi_changelog_fini(&changelog_priv);
+ if (rc < 0)
+ fprintf(stderr, "Changelog: %s\n", strerror(errno = -rc));
+
return (rc == 1 ? 0 : rc);
}
}
if (printcur)
- fprintf(stdout, "%lld %s\n", rectmp, path);
- else
- fprintf(stdout, "%s\n", path);
+ fprintf(stdout, "%lld ", rectmp);
+ if (device[0] == '/') {
+ fprintf(stdout, "%s", device);
+ if (device[strlen(device) - 1] != '/')
+ fprintf(stdout, "/");
+ } else if (path[0] == '\0') {
+ fprintf(stdout, "/");
+ }
+ fprintf(stdout, "%s\n", path);
if (linkno >= 0)
/* specified linkno */
git://git.whamcloud.com / fs / lustre-release.git / blobdiff