From a674871d5f9e4819b3428593e24df6e52096612f Mon Sep 17 00:00:00 2001 From: Swapnil Pimpale Date: Thu, 2 Jan 2014 22:20:36 +0530 Subject: [PATCH] LU-4353 strncmp: Replace incorrect strncmp()s with strcmp() This patch fixes a few places where strncmp() is used but strcmp() was meant. It also corrects calls to strncmp() in functions mdd_declare_xattr_del() and mgs_setparam(). Change-Id: I6f0fa4230bca10e8e7b310783bb89628a6eb788f Signed-off-by: Swapnil Pimpale Reviewed-on: http://review.whamcloud.com/8702 Tested-by: Jenkins Reviewed-by: John L. Hammond Tested-by: Maloo Reviewed-by: Dmitry Eremin Reviewed-by: Oleg Drokin --- lustre/lod/lod_object.c | 2 +- lustre/mdd/mdd_object.c | 26 +++++++++++++------------- lustre/mdt/mdt_xattr.c | 6 ++---- lustre/mgs/mgs_llog.c | 2 +- lustre/target/out_handler.c | 3 +-- 5 files changed, 18 insertions(+), 21 deletions(-) diff --git a/lustre/lod/lod_object.c b/lustre/lod/lod_object.c index 6179e4d..afd9373 100644 --- a/lustre/lod/lod_object.c +++ b/lustre/lod/lod_object.c @@ -530,7 +530,7 @@ static int lod_xattr_set(const struct lu_env *env, attr = dt->do_lu.lo_header->loh_attr & S_IFMT; if (S_ISDIR(attr)) { - if (strncmp(name, XATTR_NAME_LOV, strlen(XATTR_NAME_LOV)) == 0) + if (strcmp(name, XATTR_NAME_LOV) == 0) rc = lod_xattr_set_lov_on_dir(env, dt, buf, name, fl, th, capa); else diff --git a/lustre/mdd/mdd_object.c b/lustre/mdd/mdd_object.c index 891628c..c030dfa 100644 --- a/lustre/mdd/mdd_object.c +++ b/lustre/mdd/mdd_object.c @@ -936,15 +936,14 @@ static int mdd_declare_xattr_set(const struct lu_env *env, /* Only record user and layout xattr changes */ if (strncmp(XATTR_USER_PREFIX, name, sizeof(XATTR_USER_PREFIX) - 1) == 0 || - strncmp(XATTR_NAME_LOV, name, - sizeof(XATTR_NAME_LOV) - 1) == 0) { + strcmp(XATTR_NAME_LOV, name) == 0) { rc = mdd_declare_changelog_store(env, mdd, NULL, handle); if (rc) return rc; } /* If HSM data is modified, this could add a changelog */ - if (strncmp(XATTR_NAME_HSM, name, sizeof(XATTR_NAME_HSM) - 1) == 0) { + if (strcmp(XATTR_NAME_HSM, name) == 0) { rc = mdd_declare_changelog_store(env, mdd, NULL, handle); if (rc) return rc; @@ -1059,7 +1058,7 @@ static int mdd_xattr_set(const struct lu_env *env, struct md_object *obj, mdd_write_lock(env, mdd_obj, MOR_TGT_CHILD); - if (strncmp(XATTR_NAME_HSM, name, sizeof(XATTR_NAME_HSM) - 1) == 0) { + if (strcmp(XATTR_NAME_HSM, name) == 0) { rc = mdd_hsm_update_locked(env, obj, buf, handle); if (rc) { mdd_write_unlock(env, mdd_obj); @@ -1073,7 +1072,7 @@ static int mdd_xattr_set(const struct lu_env *env, struct md_object *obj, if (rc) GOTO(stop, rc); - if (strncmp(XATTR_NAME_LOV, name, sizeof(XATTR_NAME_LOV) - 1) == 0) + if (strcmp(XATTR_NAME_LOV, name) == 0) rc = mdd_changelog_data_store(env, mdd, CL_LAYOUT, 0, mdd_obj, handle); else if (strncmp(XATTR_USER_PREFIX, name, @@ -1097,17 +1096,18 @@ static int mdd_declare_xattr_del(const struct lu_env *env, const char *name, struct thandle *handle) { - int rc; + int rc; - rc = mdo_declare_xattr_del(env, obj, name, handle); - if (rc) - return rc; + rc = mdo_declare_xattr_del(env, obj, name, handle); + if (rc) + return rc; - /* Only record user xattr changes */ - if ((strncmp("user.", name, 5) == 0)) - rc = mdd_declare_changelog_store(env, mdd, NULL, handle); + /* Only record user xattr changes */ + if ((strncmp(XATTR_USER_PREFIX, name, + sizeof(XATTR_USER_PREFIX) - 1) == 0)) + rc = mdd_declare_changelog_store(env, mdd, NULL, handle); - return rc; + return rc; } /** diff --git a/lustre/mdt/mdt_xattr.c b/lustre/mdt/mdt_xattr.c index 1abef7e..fba6c2d 100644 --- a/lustre/mdt/mdt_xattr.c +++ b/lustre/mdt/mdt_xattr.c @@ -423,10 +423,8 @@ int mdt_reint_setxattr(struct mdt_thread_info *info, strcmp(xattr_name, XATTR_NAME_LFSCK_NAMESPACE) == 0) GOTO(out, rc = 0); } else if ((valid & OBD_MD_FLXATTR) && - (strncmp(xattr_name, XATTR_NAME_ACL_ACCESS, - sizeof(XATTR_NAME_ACL_ACCESS) - 1) == 0 || - strncmp(xattr_name, XATTR_NAME_ACL_DEFAULT, - sizeof(XATTR_NAME_ACL_DEFAULT) - 1) == 0)) { + (strcmp(xattr_name, XATTR_NAME_ACL_ACCESS) == 0 || + strcmp(xattr_name, XATTR_NAME_ACL_DEFAULT) == 0)) { /* currently lustre limit acl access size */ if (xattr_len > LUSTRE_POSIX_ACL_MAX_SIZE) GOTO(out, rc = -ERANGE); diff --git a/lustre/mgs/mgs_llog.c b/lustre/mgs/mgs_llog.c index 3133b24..f88c10b 100644 --- a/lustre/mgs/mgs_llog.c +++ b/lustre/mgs/mgs_llog.c @@ -3794,7 +3794,7 @@ int mgs_setparam(const struct lu_env *env, struct mgs_device *mgs, if (rc == 0 && !mgs_parse_devname(devname, NULL, &index)) { /* param related to llite isn't allowed to set by OST or MDT */ if (rc == 0 && strncmp(param, PARAM_LLITE, - sizeof(PARAM_LLITE)) == 0) + sizeof(PARAM_LLITE) - 1) == 0) RETURN(-EINVAL); } else { /* assume devname is the fsname */ diff --git a/lustre/target/out_handler.c b/lustre/target/out_handler.c index a848f87..af53474 100644 --- a/lustre/target/out_handler.c +++ b/lustre/target/out_handler.c @@ -610,8 +610,7 @@ static int out_tx_xattr_set_exec(const struct lu_env *env, /** * Ignore errors if this is LINK EA **/ - if (unlikely(rc && !strncmp(arg->u.xattr_set.name, XATTR_NAME_LINK, - strlen(XATTR_NAME_LINK)))) + if (unlikely(rc && !strcmp(arg->u.xattr_set.name, XATTR_NAME_LINK))) rc = 0; CDEBUG(D_INFO, "%s: insert xattr set reply %p index %d: rc = %d\n", -- 1.8.3.1