Commit 1ada25dc authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman
Browse files

staging: lustre: lustre: resolve "use spaces between elements" checkpatch errors 



Due to the way the DFID was embedded in our debug strings checkpatch
would report the following error:

CHECK: Concatenated strings should use spaces between elements

This patch introduces proper space to resolve these reports.

Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d06838de

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

+3 −4
Original line number Diff line number Diff line
@@ -153,8 +153,7 @@ static int lov_init_sub(const struct lu_env *env, struct lov_object *lov, 
	subhdr = cl_object_header(stripe);



	oinfo = lov->lo_lsm->lsm_oinfo[idx];

	CDEBUG(D_INODE, DFID"@%p[%d] -> "DFID"@%p: ostid: "DOSTID

	       " idx: %d gen: %d\n",

	CDEBUG(D_INODE, DFID "@%p[%d] -> " DFID "@%p: ostid: " DOSTID " idx: %d gen: %d\n",

	       PFID(&subhdr->coh_lu.loh_fid), subhdr, idx,

	       PFID(&hdr->coh_lu.loh_fid), hdr, POSTID(&oinfo->loi_oi),

	       oinfo->loi_ost_idx, oinfo->loi_ost_gen);

drivers/staging/lustre/lustre/osc/osc_request.c

+1 −2
Original line number Diff line number Diff line
@@ -1227,8 +1227,7 @@ static int check_write_checksum(struct obdo *oa, 
		msg = "changed in transit AND doesn't match the original - likely false positive due to mmap IO (bug 11742)"

			;



	LCONSOLE_ERROR_MSG(0x132, "BAD WRITE CHECKSUM: %s: from %s inode "DFID

			   " object "DOSTID" extent [%llu-%llu]\n",

	LCONSOLE_ERROR_MSG(0x132, "BAD WRITE CHECKSUM: %s: from %s inode " DFID " object " DOSTID " extent [%llu-%llu]\n",

			   msg, libcfs_nid2str(peer->nid),

			   oa->o_valid & OBD_MD_FLFID ? oa->o_parent_seq : (__u64)0,

			   oa->o_valid & OBD_MD_FLFID ? oa->o_parent_oid : 0,

drivers/staging/lustre/lustre/ptlrpc/client.c

+2 −2
Original line number Diff line number Diff line
@@ -367,8 +367,8 @@ void ptlrpc_at_adj_net_latency(struct ptlrpc_request *req, 
		 */

		CDEBUG((lustre_msg_get_flags(req->rq_reqmsg) & MSG_RESENT) ?

		       D_ADAPTTO : D_WARNING,

		       "Reported service time %u > total measured time "

		       CFS_DURATION_T"\n", service_time,

		       "Reported service time %u > total measured time " CFS_DURATION_T "\n",

		       service_time,

		       (long)(now - req->rq_sent));

		return;

	}

drivers/staging/lustre/lustre/llite/xattr_cache.c

+2 −2

File changed.

Contains only whitespace changes.

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

+20 −20

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/lov/lov_merge.c

+2 −2

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/fid/fid_request.c

+1 −1

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/include/lustre_fid.h

+1 −1

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/llite/llite_nfs.c

+5 −5

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/llite/vvp_io.c

+1 −1

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/llite/vvp_object.c

+1 −1

File changed.

Contains only whitespace changes.

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

+2 −2

File changed.

Contains only whitespace changes.

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

+21 −21

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/obdclass/cl_lock.c

+1 −1

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/obdecho/echo_client.c

+2 −2

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/include/lustre/lustre_idl.h

+3 −3

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/mgc/mgc_request.c

+1 −1

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/obdclass/llog_cat.c

+6 −6

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/osc/osc_cache.c

+4 −4

File changed.

Contains only whitespace changes.

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

+3 −3

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/llite/xattr.c

+3 −3

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/obdclass/cl_page.c

+1 −1

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/llite/rw26.c

+1 −1

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/lmv/lmv_fld.c

+1 −1

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/llite/llite_mmap.c

+1 −1

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/fld/fld_cache.c

+3 −3

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/llite/dcache.c

+2 −2

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/llite/llite_internal.h

+2 −2

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/mdc/mdc_locks.c

+3 −3

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/include/lustre/lustre_user.h

+1 −1

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/llite/dir.c

+6 −6

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/llite/llite_lib.c

+17 −17

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/lmv/lmv_intent.c

+3 −3

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/lov/lov_pool.c

+4 −4

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/mdc/mdc_reint.c

+1 −1

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/obdclass/llog_swab.c

+1 −1

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/llite/symlink.c

+2 −2

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/lov/lov_pack.c

+3 −3

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/mdc/mdc_request.c

+8 −8

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/lov/lov_io.c

+1 −1

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/obdclass/lu_object.c

+1 −1

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/ptlrpc/pack_generic.c

+1 −1

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/ptlrpc/service.c

+1 −1

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/llite/namei.c

+19 −19

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/llite/statahead.c

+7 −7

File changed.

Contains only whitespace changes.

CRA Git | Maintained and supported by SUSTech CRA and CCSE