Commit 3d2b8f57 authored by Nathaniel Clark's avatar Nathaniel Clark Committed by Greg Kroah-Hartman
Browse files

staging/lustre/ptlrpc: Fix Multiple Assignments 



Fix all multiple assignments on lustre/ptlrpc directory.

Signed-off-by: default avatarNathaniel Clark <nathaniel.l.clark@intel.com>
Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 89c60364

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

+4 −2
Original line number Diff line number Diff line
@@ -3024,8 +3024,10 @@ void *ptlrpcd_alloc_work(struct obd_import *imp, 
	req->rq_interpret_reply = work_interpreter;

	/* don't want reply */

	req->rq_receiving_reply = 0;

	req->rq_req_unlink = req->rq_reply_unlink = 0;

	req->rq_no_delay = req->rq_no_resend = 1;

	req->rq_req_unlink = 0;

	req->rq_reply_unlink = 0;

	req->rq_no_delay = 1;

	req->rq_no_resend = 1;

	req->rq_pill.rc_fmt = (void *)&worker_format;



	spin_lock_init(&req->rq_lock);

drivers/staging/lustre/lustre/ptlrpc/import.c

+2 −1
Original line number Diff line number Diff line
@@ -698,7 +698,8 @@ int ptlrpc_connect_import(struct obd_import *imp) 


	lustre_msg_add_op_flags(request->rq_reqmsg, MSG_CONNECT_NEXT_VER);



	request->rq_no_resend = request->rq_no_delay = 1;

	request->rq_no_resend = 1;

	request->rq_no_delay = 1;

	request->rq_send_state = LUSTRE_IMP_CONNECTING;

	/* Allow a slightly larger reply for future growth compatibility */

	req_capsule_set_size(&request->rq_pill, &RMF_CONNECT_DATA, RCL_SERVER,

drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c

+2 −1
Original line number Diff line number Diff line
@@ -872,7 +872,8 @@ ptlrpc_lprocfs_svc_req_history_next(struct seq_file *s, 


		if (i > srhi->srhi_idx) { /* reset iterator for a new CPT */

			srhi->srhi_req = NULL;

			seq = srhi->srhi_seq = 0;

			seq = 0;

			srhi->srhi_seq = 0;

		} else { /* the next sequence */

			seq = srhi->srhi_seq + (1 << svc->srv_cpt_bits);

		}

drivers/staging/lustre/lustre/ptlrpc/pinger.c

+2 −1
Original line number Diff line number Diff line
@@ -57,7 +57,8 @@ ptlrpc_prep_ping(struct obd_import *imp) 
					LUSTRE_OBD_VERSION, OBD_PING);

	if (req) {

		ptlrpc_request_set_replen(req);

		req->rq_no_resend = req->rq_no_delay = 1;

		req->rq_no_resend = 1;

		req->rq_no_delay = 1;

	}

	return req;

}

drivers/staging/lustre/lustre/ptlrpc/sec_null.c

+2 −1
Original line number Diff line number Diff line
@@ -265,7 +265,8 @@ int null_enlarge_reqbuf(struct ptlrpc_sec *sec, 
		memcpy(newbuf, req->rq_reqbuf, req->rq_reqlen);



		kvfree(req->rq_reqbuf);

		req->rq_reqbuf = req->rq_reqmsg = newbuf;

		req->rq_reqbuf = newbuf;

		req->rq_reqmsg = newbuf;

		req->rq_reqbuf_len = alloc_size;



		if (req->rq_import)

CRA Git | Maintained and supported by SUSTech CRA and CCSE