From 37dd28b355a32902277997af8094671094b03c00 Mon Sep 17 00:00:00 2001 From: eeb Date: Sun, 23 Oct 2005 14:08:15 +0000 Subject: [PATCH] * socklnd: fixed connection race that can occur with multiple routers changed 'typed_conns' module parameter to RO * nidstrings: allow 0xnnnn parsing of numerical NIDs libcfs_num_addr2str -> libcfs_decnum_addr2str (LO, QSW, PTL) libcfs_hexnum_addr2str (GM) * gmlnd: change from decimal to hex representation of GM addresses (they're the lowest 4 bytes of the NIC's MAC address). * router: compare routers first on # uncompleted bytes, then credits for better load balance. * llmount: fixed error message (it's a NID, not a host) fixed bug in checking mdx & profile string lengths --- lustre/utils/llmount.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lustre/utils/llmount.c b/lustre/utils/llmount.c index 0e78d74..cba1f45 100644 --- a/lustre/utils/llmount.c +++ b/lustre/utils/llmount.c @@ -264,7 +264,7 @@ build_data(char *source, char *options, struct lustre_mount_data *lmd, profile = s + 1; } else { fprintf(stderr, "%s: directory to mount not in " - "host:/mds/profile format\n", + "nid:/mds/profile format\n", progname); return(1); } @@ -285,13 +285,13 @@ build_data(char *source, char *options, struct lustre_mount_data *lmd, return 1; } - if (strlen(mds) > sizeof(lmd->lmd_mds) + 1) { + if (strlen(mds) + 1 > sizeof(lmd->lmd_mds)) { fprintf(stderr, "%s: mds name too long\n", progname); return(1); } strcpy(lmd->lmd_mds, mds); - if (strlen(profile) > sizeof(lmd->lmd_profile) + 1) { + if (strlen(profile) + 1 > sizeof(lmd->lmd_profile)) { fprintf(stderr, "%s: profile name too long\n", progname); return(1); } -- 1.8.3.1