From: Alex Zhuravlev Date: Mon, 7 Dec 2015 06:42:24 +0000 (+0300) Subject: LU-7521 ldlm: LDLM_DEBUG() shouldn't be passed \n X-Git-Tag: 2.8.53~17 X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=f28cc25929c4e8a111e96b2205a0433542b35e84;p=fs%2Flustre-release.git LU-7521 ldlm: LDLM_DEBUG() shouldn't be passed \n as it adds own \n, so any extra \n break log format. Change-Id: Ie78d0969421b744db6789d7bd46505ba7097a46b Signed-off-by: Alex Zhuravlev Reviewed-on: http://review.whamcloud.com/17494 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: John L. Hammond Reviewed-by: Andreas Dilger --- diff --git a/lustre/ldlm/ldlm_lock.c b/lustre/ldlm/ldlm_lock.c index 90580b0..28c2039 100644 --- a/lustre/ldlm/ldlm_lock.c +++ b/lustre/ldlm/ldlm_lock.c @@ -1626,7 +1626,7 @@ int ldlm_fill_lvb(struct ldlm_lock *lock, struct req_capsule *pill, memcpy(data, lvb, size); break; default: - LDLM_ERROR(lock, "Unknown LVB type: %d\n", lock->l_lvb_type); + LDLM_ERROR(lock, "Unknown LVB type: %d", lock->l_lvb_type); libcfs_debug_dumpstack(NULL); RETURN(-EINVAL); } diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c index e848e5c..c86a314 100644 --- a/lustre/ldlm/ldlm_lockd.c +++ b/lustre/ldlm/ldlm_lockd.c @@ -2275,28 +2275,28 @@ static int ldlm_callback_handler(struct ptlrpc_request *req) lock_res_and_lock(lock); lock->l_flags |= ldlm_flags_from_wire(dlm_req->lock_flags & LDLM_FL_AST_MASK); - if (lustre_msg_get_opc(req->rq_reqmsg) == LDLM_BL_CALLBACK) { - /* If somebody cancels lock and cache is already dropped, - * or lock is failed before cp_ast received on client, - * we can tell the server we have no lock. Otherwise, we - * should send cancel after dropping the cache. */ + if (lustre_msg_get_opc(req->rq_reqmsg) == LDLM_BL_CALLBACK) { + /* If somebody cancels lock and cache is already dropped, + * or lock is failed before cp_ast received on client, + * we can tell the server we have no lock. Otherwise, we + * should send cancel after dropping the cache. */ if ((ldlm_is_canceling(lock) && ldlm_is_bl_done(lock)) || - ldlm_is_failed(lock)) { - LDLM_DEBUG(lock, "callback on lock " - LPX64" - lock disappeared\n", - dlm_req->lock_handle[0].cookie); - unlock_res_and_lock(lock); - LDLM_LOCK_RELEASE(lock); - rc = ldlm_callback_reply(req, -EINVAL); - ldlm_callback_errmsg(req, "Operate on stale lock", rc, - &dlm_req->lock_handle[0]); - RETURN(0); - } + ldlm_is_failed(lock)) { + LDLM_DEBUG(lock, "callback on lock " + LPX64" - lock disappeared", + dlm_req->lock_handle[0].cookie); + unlock_res_and_lock(lock); + LDLM_LOCK_RELEASE(lock); + rc = ldlm_callback_reply(req, -EINVAL); + ldlm_callback_errmsg(req, "Operate on stale lock", rc, + &dlm_req->lock_handle[0]); + RETURN(0); + } /* BL_AST locks are not needed in LRU. * Let ldlm_cancel_lru() be fast. */ - ldlm_lock_remove_from_lru(lock); + ldlm_lock_remove_from_lru(lock); ldlm_set_bl_ast(lock); - } + } unlock_res_and_lock(lock); /* We want the ost thread to get this reply so that it can respond diff --git a/lustre/ldlm/ldlm_request.c b/lustre/ldlm/ldlm_request.c index 1e2a6cd..f9faf01 100644 --- a/lustre/ldlm/ldlm_request.c +++ b/lustre/ldlm/ldlm_request.c @@ -916,7 +916,7 @@ int ldlm_cli_enqueue(struct obd_export *exp, struct ptlrpc_request **reqp, lock->l_req_extent = policy->l_extent; } - LDLM_DEBUG(lock, "client-side enqueue START, flags "LPX64"\n", + LDLM_DEBUG(lock, "client-side enqueue START, flags "LPX64, *flags); } diff --git a/lustre/ldlm/ldlm_resource.c b/lustre/ldlm/ldlm_resource.c index 10f8681..1fe7c93 100644 --- a/lustre/ldlm/ldlm_resource.c +++ b/lustre/ldlm/ldlm_resource.c @@ -1320,11 +1320,11 @@ EXPORT_SYMBOL(ldlm_resource_putref); * Add a lock into a given resource into specified lock list. */ void ldlm_resource_add_lock(struct ldlm_resource *res, struct list_head *head, - struct ldlm_lock *lock) + struct ldlm_lock *lock) { check_res_locked(res); - LDLM_DEBUG(lock, "About to add this lock:\n"); + LDLM_DEBUG(lock, "About to add this lock"); if (ldlm_is_destroyed(lock)) { CDEBUG(D_OTHER, "Lock destroyed, not adding to resource\n"); @@ -1349,7 +1349,7 @@ void ldlm_resource_insert_lock_after(struct ldlm_lock *original, check_res_locked(res); ldlm_resource_dump(D_INFO, res); - LDLM_DEBUG(new, "About to insert this lock after %p:\n", original); + LDLM_DEBUG(new, "About to insert this lock after %p: ", original); if (ldlm_is_destroyed(new)) { CDEBUG(D_OTHER, "Lock destroyed, not adding to resource\n"); diff --git a/lustre/llite/vvp_internal.h b/lustre/llite/vvp_internal.h index 7ceabd5..f844023 100644 --- a/lustre/llite/vvp_internal.h +++ b/lustre/llite/vvp_internal.h @@ -323,7 +323,7 @@ static inline struct vvp_lock *cl2vvp_lock(const struct cl_lock_slice *slice) do { \ if (unlikely(!(expr))) { \ LU_OBJECT_DEBUG(D_ERROR, (env), &(clob)->co_lu, \ - #expr "\n"); \ + #expr); \ LINVRNT(0); \ } \ } while (0) diff --git a/lustre/lov/lov_object.c b/lustre/lov/lov_object.c index c1b12fe..bd10384 100644 --- a/lustre/lov/lov_object.c +++ b/lustre/lov/lov_object.c @@ -195,8 +195,8 @@ static int lov_init_sub(const struct lu_env *env, struct lov_object *lov, } LU_OBJECT_DEBUG(mask, env, &stripe->co_lu, - "stripe %d is already owned.\n", idx); - LU_OBJECT_DEBUG(mask, env, old_obj, "owned.\n"); + "stripe %d is already owned.", idx); + LU_OBJECT_DEBUG(mask, env, old_obj, "owned."); LU_OBJECT_HEADER(mask, env, lov2lu(lov), "try to own.\n"); cl_object_put(env, stripe); } diff --git a/lustre/mdc/mdc_locks.c b/lustre/mdc/mdc_locks.c index d743188..4f6b14ee 100644 --- a/lustre/mdc/mdc_locks.c +++ b/lustre/mdc/mdc_locks.c @@ -691,7 +691,7 @@ static int mdc_finish_enqueue(struct obd_export *exp, !(lockrep->lock_flags & LDLM_FL_BLOCKED_MASK)) { void *lmm; - LDLM_DEBUG(lock, "layout lock returned by: %s, lvb_len: %d\n", + LDLM_DEBUG(lock, "layout lock returned by: %s, lvb_len: %d", ldlm_it2str(it->it_op), lvb_len); OBD_ALLOC_LARGE(lmm, lvb_len); diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c index acae122..7f13b08 100644 --- a/lustre/mdt/mdt_handler.c +++ b/lustre/mdt/mdt_handler.c @@ -1422,7 +1422,7 @@ static int mdt_getattr_name_lock(struct mdt_thread_info *info, if (!mdt_object_exists(child)) { LU_OBJECT_DEBUG(D_INFO, info->mti_env, &child->mot_obj, - "remote object doesn't exist.\n"); + "remote object doesn't exist."); mdt_object_unlock(info, child, lhc, 1); RETURN(-ENOENT); } @@ -1462,7 +1462,7 @@ static int mdt_getattr_name_lock(struct mdt_thread_info *info, if (unlikely(!mdt_object_exists(parent)) && lu_name_is_valid(lname)) { LU_OBJECT_DEBUG(D_INODE, info->mti_env, &parent->mot_obj, - "Parent doesn't exist!\n"); + "Parent doesn't exist!"); RETURN(-ESTALE); } @@ -1533,7 +1533,7 @@ static int mdt_getattr_name_lock(struct mdt_thread_info *info, if (!mdt_object_exists(child)) { LU_OBJECT_DEBUG(D_INODE, info->mti_env, &child->mot_obj, - "Object doesn't exist!\n"); + "Object doesn't exist!"); GOTO(out_child, rc = -ENOENT); } @@ -2381,7 +2381,7 @@ int mdt_remote_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc, } break; case LDLM_CB_CANCELING: - LDLM_DEBUG(lock, "Revoke remote lock\n"); + LDLM_DEBUG(lock, "Revoke remote lock"); /* discard slc lock here so that it can be cleaned anytime, * especially for cleanup_resource() */ tgt_discard_slc_lock(lock); @@ -2408,7 +2408,7 @@ int mdt_check_resent_lock(struct mdt_thread_info *info, /* Lock is pinned by ldlm_handle_enqueue0() as it is * a resend case, however, it could be already destroyed * due to client eviction or a raced cancel RPC. */ - LDLM_DEBUG_NOLOCK("Invalid lock handle "LPX64"\n", + LDLM_DEBUG_NOLOCK("Invalid lock handle "LPX64, lhc->mlh_reg_lh.cookie); RETURN(-ESTALE); } diff --git a/lustre/mdt/mdt_open.c b/lustre/mdt/mdt_open.c index 44d50f7..de291a4 100644 --- a/lustre/mdt/mdt_open.c +++ b/lustre/mdt/mdt_open.c @@ -1145,7 +1145,7 @@ static int mdt_cross_open(struct mdt_thread_info *info, mdt_obd_name(info->mti_mdt), PFID(fid), -EFAULT); LU_OBJECT_DEBUG(D_WARNING, info->mti_env, &o->mot_obj, - "Object isn't on this server! FLD error?\n"); + "Object isn't on this server! FLD error?"); rc = -EFAULT; } else { if (mdt_object_exists(o)) { @@ -1646,7 +1646,7 @@ static int mdt_hsm_release(struct mdt_thread_info *info, struct mdt_object *o, lease_broken = ldlm_is_cancel(lease); unlock_res_and_lock(lease); - LDLM_DEBUG(lease, DFID " lease broken? %d\n", + LDLM_DEBUG(lease, DFID " lease broken? %d", PFID(mdt_object_fid(o)), lease_broken); /* Cancel server side lease. Client side counterpart should @@ -1769,7 +1769,7 @@ out_close: CERROR("%s: error closing volatile file "DFID": rc = %d\n", mdt_obd_name(info->mti_mdt), PFID(&data->cd_fid), rc2); LU_OBJECT_DEBUG(D_HSM, info->mti_env, &orphan->mot_obj, - "object closed\n"); + "object closed"); mdt_object_put(info->mti_env, orphan); out_unlock: @@ -1864,7 +1864,7 @@ int mdt_close_swap_layouts(struct mdt_thread_info *info, lease_broken = ldlm_is_cancel(lease); unlock_res_and_lock(lease); - LDLM_DEBUG(lease, DFID " lease broken? %d\n", + LDLM_DEBUG(lease, DFID " lease broken? %d", PFID(mdt_object_fid(o)), lease_broken); /* Cancel server side lease. Client side counterpart should diff --git a/lustre/mdt/mdt_reint.c b/lustre/mdt/mdt_reint.c index be3727d..4292119 100644 --- a/lustre/mdt/mdt_reint.c +++ b/lustre/mdt/mdt_reint.c @@ -1619,7 +1619,7 @@ static int mdt_reint_migrate_internal(struct mdt_thread_info *info, lease_broken = ldlm_is_cancel(lease); unlock_res_and_lock(lease); - LDLM_DEBUG(lease, DFID " lease broken? %d\n", + LDLM_DEBUG(lease, DFID " lease broken? %d", PFID(mdt_object_fid(mold)), lease_broken); /* Cancel server side lease. Client side counterpart should diff --git a/lustre/osc/osc_cache.c b/lustre/osc/osc_cache.c index 2b15cb8..57e83e2 100644 --- a/lustre/osc/osc_cache.c +++ b/lustre/osc/osc_cache.c @@ -130,9 +130,9 @@ static const char *oes_strings[] = { /* ----- part 4 ----- */ \ ## __VA_ARGS__); \ if (lvl == D_ERROR && __ext->oe_dlmlock != NULL) \ - LDLM_ERROR(__ext->oe_dlmlock, "extent: %p\n", __ext); \ + LDLM_ERROR(__ext->oe_dlmlock, "extent: %p", __ext); \ else \ - LDLM_DEBUG(__ext->oe_dlmlock, "extent: %p\n", __ext); \ + LDLM_DEBUG(__ext->oe_dlmlock, "extent: %p", __ext); \ } while (0) #undef EASSERTF diff --git a/lustre/osc/osc_lock.c b/lustre/osc/osc_lock.c index f26a5e7..7574887 100644 --- a/lustre/osc/osc_lock.c +++ b/lustre/osc/osc_lock.c @@ -1197,7 +1197,7 @@ int osc_lock_init(const struct lu_env *env, if (io->ci_type == CIT_WRITE || cl_io_is_mkwrite(io)) osc_lock_set_writer(env, io, obj, oscl); - LDLM_DEBUG_NOLOCK("lock %p, osc lock %p, flags "LPX64"\n", + LDLM_DEBUG_NOLOCK("lock %p, osc lock %p, flags "LPX64, lock, oscl, oscl->ols_flags); return 0; diff --git a/lustre/osd-zfs/osd_index.c b/lustre/osd-zfs/osd_index.c index 8b6c8fe..4e5a5b4 100644 --- a/lustre/osd-zfs/osd_index.c +++ b/lustre/osd-zfs/osd_index.c @@ -519,7 +519,7 @@ struct osd_object *osd_object_find(const struct lu_env *env, child = osd_obj(lo); else LU_OBJECT_DEBUG(D_ERROR, env, luch, - "%s: object can't be located "DFID"\n", + "%s: object can't be located "DFID, osd_dev(ludev)->od_svname, PFID(fid)); if (child == NULL) { @@ -530,7 +530,7 @@ struct osd_object *osd_object_find(const struct lu_env *env, } } else { LU_OBJECT_DEBUG(D_ERROR, env, luch, - "%s: lu_object does not exists "DFID"\n", + "%s: lu_object does not exists "DFID, osd_dev(ludev)->od_svname, PFID(fid)); lu_object_put(env, luch); child = ERR_PTR(-ENOENT);