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

Commit 19b2056f authored by James Nunez's avatar James Nunez Committed by Greg Kroah-Hartman
Browse files

staging: lustre: Correct missing newline 



Several error messages are missing newline characters
at the end of the message. Newlines are added where
necessary and other minor corrections; no punctuation
at the end of an error message, add a return code to
the end of error messages, device name at the beginning,
etc.

There are just a couple of places where newlines are
removed and this is only in LDLM_DEBUG_NOLOCK. The definition
of LDLM_DEBUG_NOLOCK already has a newline in it and
resulted in double newlines printed.

Signed-off-by: default avatarJames Nunez <james.a.nunez@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-4871
Reviewed-on: http://review.whamcloud.com/10000


Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Reviewed-by: default avatarCliff White <cliff.white@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ea7a1484

drivers/staging/lustre/lnet/selftest/framework.c

+3 −3
Original line number Diff line number Diff line
@@ -453,7 +453,7 @@ sfw_make_session(srpc_mksn_reqst_t *request, srpc_mksn_reply_t *reply) 
	/* brand new or create by force */

	LIBCFS_ALLOC(sn, sizeof(sfw_session_t));

	if (!sn) {

		CERROR("Dropping RPC (mksn) under memory pressure.\n");

		CERROR("dropping RPC mksn under memory pressure\n");

		return -ENOMEM;

	}
@@ -1155,7 +1155,7 @@ sfw_add_test(struct srpc_server_rpc *rpc) 


	bat = sfw_bid2batch(request->tsr_bid);

	if (!bat) {

		CERROR("Dropping RPC (%s) from %s under memory pressure.\n",

		CERROR("dropping RPC %s from %s under memory pressure\n",

		       rpc->srpc_scd->scd_svc->sv_name,

		       libcfs_id2str(rpc->srpc_peer));

		return -ENOMEM;
@@ -1367,7 +1367,7 @@ sfw_bulk_ready(struct srpc_server_rpc *rpc, int status) 
	}



	if (sfw_del_session_timer()) {

		CERROR("Dropping RPC (%s) from %s: racing with expiry timer",

		CERROR("dropping RPC %s from %s: racing with expiry timer\n",

		       sv->sv_name, libcfs_id2str(rpc->srpc_peer));

		spin_unlock(&sfw_data.fw_lock);

		return -EAGAIN;

drivers/staging/lustre/lnet/selftest/rpc.c

+1 −1
Original line number Diff line number Diff line
@@ -667,7 +667,7 @@ srpc_finish_service(struct srpc_service *sv) 
		}



		if (scd->scd_buf_nposted > 0) {

			CDEBUG(D_NET, "waiting for %d posted buffers to unlink",

			CDEBUG(D_NET, "waiting for %d posted buffers to unlink\n",

			       scd->scd_buf_nposted);

			spin_unlock(&scd->scd_lock);

			return 0;

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

+1 −1
Original line number Diff line number Diff line
@@ -1041,7 +1041,7 @@ int ldlm_cli_cancel(struct lustre_handle *lockh, 
	/* concurrent cancels on the same handle can happen */

	lock = ldlm_handle2lock_long(lockh, LDLM_FL_CANCELING);

	if (!lock) {

		LDLM_DEBUG_NOLOCK("lock is already being destroyed\n");

		LDLM_DEBUG_NOLOCK("lock is already being destroyed");

		return 0;

	}

drivers/staging/lustre/lustre/llite/file.c

+4 −4
Original line number Diff line number Diff line
@@ -952,7 +952,7 @@ static int ll_lsm_getattr(struct lov_stripe_md *lsm, struct obd_export *exp, 


	set = ptlrpc_prep_set();

	if (!set) {

		CERROR("can't allocate ptlrpc set\n");

		CERROR("cannot allocate ptlrpc set: rc = %d\n", -ENOMEM);

		rc = -ENOMEM;

	} else {

		rc = obd_getattr_async(exp, &oinfo, set);
@@ -1180,7 +1180,7 @@ ll_file_io_generic(const struct lu_env *env, struct vvp_io_args *args, 
		CDEBUG(D_VFSTRACE, "Restart %s on %pD from %lld, count:%zd\n",

		       iot == CIT_READ ? "read" : "write",

		       file, *ppos, count);

		LASSERTF(io->ci_nob == 0, "%zd", io->ci_nob);

		LASSERTF(io->ci_nob == 0, "%zd\n", io->ci_nob);

		goto restart;

	}
@@ -3415,7 +3415,7 @@ static int ll_layout_lock_set(struct lustre_handle *lockh, enum ldlm_mode mode, 
	LASSERT(lock);

	LASSERT(ldlm_has_layout(lock));



	LDLM_DEBUG(lock, "File %p/"DFID" being reconfigured: %d.\n",

	LDLM_DEBUG(lock, "File %p/"DFID" being reconfigured: %d",

		   inode, PFID(&lli->lli_fid), reconf);



	/* in case this is a caching lock and reinstate with new inode */
@@ -3571,7 +3571,7 @@ int ll_layout_refresh(struct inode *inode, __u32 *gen) 
	it.it_op = IT_LAYOUT;

	lockh.cookie = 0ULL;



	LDLM_DEBUG_NOLOCK("%s: requeue layout lock for file %p/" DFID ".\n",

	LDLM_DEBUG_NOLOCK("%s: requeue layout lock for file %p/" DFID "",

			  ll_get_fsname(inode->i_sb, NULL, 0), inode,

			PFID(&lli->lli_fid));

drivers/staging/lustre/lustre/lmv/lmv_obd.c

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ static int lmv_init_ea_size(struct obd_export *exp, int easize, 
		rc = md_init_ea_size(lmv->tgts[i]->ltd_exp, easize, def_easize,

				     cookiesize, def_cookiesize);

		if (rc) {

			CERROR("%s: obd_init_ea_size() failed on MDT target %d: rc = %d.\n",

			CERROR("%s: obd_init_ea_size() failed on MDT target %d: rc = %d\n",

			       obd->obd_name, i, rc);

			break;

		}