From: Liu Yuan <tailai.ly at taobao.com> Signed-off-by: Liu Yuan <tailai.ly at taobao.com> --- collie/vdi.c | 2 +- sheep/sheep.c | 4 ++-- sheepfs/core.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/collie/vdi.c b/collie/vdi.c index d76307e..a1795b3 100644 --- a/collie/vdi.c +++ b/collie/vdi.c @@ -1504,7 +1504,7 @@ out: } static struct subcommand vdi_cmd[] = { - {"check", "<vdiname>", "saph", "check and repare image's consistency", + {"check", "<vdiname>", "saph", "check and repair image's consistency", SUBCMD_FLAG_NEED_NODELIST|SUBCMD_FLAG_NEED_THIRD_ARG, vdi_check}, {"create", "<vdiname> <size>", "Paph", "create an image", SUBCMD_FLAG_NEED_NODELIST|SUBCMD_FLAG_NEED_THIRD_ARG, vdi_create}, diff --git a/sheep/sheep.c b/sheep/sheep.c index b541b45..49d3cda 100644 --- a/sheep/sheep.c +++ b/sheep/sheep.c @@ -73,12 +73,12 @@ Options:\n\ -g, --nr_gateway_worker set the number of workers for Guests' requests (default 4)\n\ -G, --gateway make the progam run as a gateway mode (same as '-v 0')\n\ -h, --help display this help and exit\n\ - -i, --nr_io_worker set the number of workers for sheep internal requests (default 4)\n\ + -i, --nr_io_worker set the number of workers for inter-sheep requests (default 4)\n\ -l, --loglevel specify the level of logging detail\n\ -o, --stdout log to stdout instead of shared logger\n\ -p, --port specify the TCP port on which to listen\n\ -v, --vnodes specify the number of virtual nodes\n\ - -W, --disable-cache disable writecache\n\ + -W, --disable-cache disable object cache\n\ -y, --myaddr specify the address advertised to other sheep\n\ -z, --zone specify the zone id\n\ ", PACKAGE_VERSION, program_name); diff --git a/sheepfs/core.c b/sheepfs/core.c index ee52bd2..e46b3b8 100644 --- a/sheepfs/core.c +++ b/sheepfs/core.c @@ -45,7 +45,7 @@ static struct option const long_options[] = { {"help", no_argument, NULL, 'h'}, {"foreground", no_argument, NULL, 'f'}, {"pagecache", no_argument, NULL, 'k'}, - {"no-object-cache", no_argument, NULL, 'n'}, + {"noobjectcache", no_argument, NULL, 'n'}, {"port", required_argument, NULL, 'p'}, {NULL, 0, NULL, 0}, }; @@ -302,7 +302,7 @@ Options:\n\ -d, --debug enable debug output (implies -f)\n\ -f, --foreground sheepfs run in the foreground\n\ -k, --pagecache use local kernel's page cache to access volume\n\ - -n --no-object-cache disable object cache of the attached volumes\n\ + -n --noobjectcache disable object cache of the attached volumes\n\ -p --port specify the sheep port (default: 7000)\n\ -h, --help display this help and exit\n\ "); -- 1.7.10.2 |