Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e93876dd authored by Alex Zhuravlev's avatar Alex Zhuravlev Committed by Greg Kroah-Hartman
Browse files

staging/lustre: LDLM_DEBUG() shouldn't be passed \n 



as it adds own \n, so any extra \n break log format.

Signed-off-by: default avatarAlex Zhuravlev <alexey.zhuravlev@intel.com>
Reviewed-on: http://review.whamcloud.com/17494
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-7521


Reviewed-by: default avatarJames Simmons <uja.ornl@yahoo.com>
Reviewed-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0e5fd06c

drivers/staging/lustre/lustre/ldlm/ldlm_lock.c

+1 −1
Original line number Diff line number Diff line
@@ -1440,7 +1440,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);

		dump_stack();

		return -EINVAL;

	}

drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c

+2 −1
Original line number Diff line number Diff line
@@ -637,7 +637,8 @@ static int ldlm_callback_handler(struct ptlrpc_request *req) 
		 */

		if ((ldlm_is_canceling(lock) && ldlm_is_bl_done(lock)) ||

		    ldlm_is_failed(lock)) {

			LDLM_DEBUG(lock, "callback on lock %#llx - lock disappeared\n",

			LDLM_DEBUG(lock,

				   "callback on lock %#llx - lock disappeared",

				   dlm_req->lock_handle[0].cookie);

			unlock_res_and_lock(lock);

			LDLM_LOCK_RELEASE(lock);

drivers/staging/lustre/lustre/ldlm/ldlm_request.c

+1 −1
Original line number Diff line number Diff line
@@ -711,7 +711,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 %llx\n",

		LDLM_DEBUG(lock, "client-side enqueue START, flags %llx",

			   *flags);

	}

drivers/staging/lustre/lustre/ldlm/ldlm_resource.c

+1 −1
Original line number Diff line number Diff line
@@ -1275,7 +1275,7 @@ void ldlm_resource_add_lock(struct ldlm_resource *res, struct list_head *head, 
{

	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");

drivers/staging/lustre/lustre/lov/lov_object.c

+2 −2
Original line number Diff line number Diff line
@@ -181,8 +181,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);

	}