From d0c7bfdc0761bc21d6f107a5d9646c13bac3d109 Mon Sep 17 00:00:00 2001 From: nathan Date: Fri, 10 Oct 2008 19:08:54 +0000 Subject: [PATCH] b=17299 i=adilger i=nathan rename MAXPOOLAME with LOV_MAXPOOLNAME --- lustre/utils/liblustreapi.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lustre/utils/liblustreapi.c b/lustre/utils/liblustreapi.c index 664e588..34a476e 100644 --- a/lustre/utils/liblustreapi.c +++ b/lustre/utils/liblustreapi.c @@ -311,7 +311,7 @@ int llapi_file_open_pool(const char *name, int flags, int mode, if (poolpath(fsname, NULL, NULL) == 0) pool_name = ptr + 1; } - strncpy(lum.lmm_pool_name, pool_name, MAXPOOLNAME); + strncpy(lum.lmm_pool_name, pool_name, LOV_MAXPOOLNAME); } else { /* If no pool is specified at all, use V1 request */ lum.lmm_magic = LOV_USER_MAGIC_V1; @@ -957,13 +957,13 @@ void llapi_lov_dump_user_lmm(struct find_param *param, (param->verbose || !param->obduuid)); break; case LOV_USER_MAGIC_V3: { - char pool_name[MAXPOOLNAME + 1]; + char pool_name[LOV_MAXPOOLNAME + 1]; struct lov_user_ost_data_v1 *objects; strncpy(pool_name, ((struct lov_user_md_v3 *)(¶m->lmd->lmd_lmm))->lmm_pool_name, - MAXPOOLNAME); - pool_name[MAXPOOLNAME] = '\0'; + LOV_MAXPOOLNAME); + pool_name[LOV_MAXPOOLNAME] = '\0'; objects = ((struct lov_user_md_v3 *)(¶m->lmd->lmd_lmm))->lmm_objects; lov_dump_user_lmm_v1v3(¶m->lmd->lmd_lmm, pool_name, objects, path, is_dir, @@ -1411,7 +1411,7 @@ static int cb_find_init(char *path, DIR *parent, DIR *dir, (param->poolname[0] == '\0')) || ((param->lmd->lmd_lmm.lmm_magic == LOV_USER_MAGIC_V3) && (strncmp(((struct lov_user_md_v3 *)(&(param->lmd->lmd_lmm)))->lmm_pool_name, - param->poolname, MAXPOOLNAME) == 0)) || + param->poolname, LOV_MAXPOOLNAME) == 0)) || ((param->lmd->lmd_lmm.lmm_magic == LOV_USER_MAGIC_V3) && (strcmp(param->poolname, "*") == 0))) { if (param->exclude_pool) -- 1.8.3.1