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

Commit 9275036e authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman
Browse files

staging: lustre: ptlrpc: restore 64-bit time for struct ptlrpc_cli_req 



During the reorganization of ptlrpc_request some of the
time64_t fields were incorrectly turned into time_t.
Restore those fields back to time_64_t.

Signed-off-by: default avatarJames Simmons <uja.ornl@yahoo.com>
Reviewed-on: https://review.whamcloud.com/24977
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-4423


Fixes: 32c8728d ("staging/lustre/ptlrpc: reorganize ptlrpc_request")
CC: Liang Zhen <liang.zhen@intel.com>
Reviewed-by: default avatarBob Glossman <bob.glossman@intel.com>
Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7da5e890

drivers/staging/lustre/lustre/include/lustre_net.h

+5 −5
Original line number Diff line number Diff line
@@ -558,13 +558,13 @@ struct ptlrpc_cli_req { 
	/** request sent timeval */

	struct timespec64		 cr_sent_tv;

	/** time for request really sent out */

	time_t				 cr_sent_out;

	time64_t			 cr_sent_out;

	/** when req reply unlink must finish. */

	time_t				 cr_reply_deadline;

	time64_t			 cr_reply_deadline;

	/** when req bulk unlink must finish. */

	time_t				 cr_bulk_deadline;

	time64_t			 cr_bulk_deadline;

	/** when req unlink must finish. */

	time_t				 cr_req_deadline;

	time64_t			 cr_req_deadline;

	/** Portal to which this request would be sent */

	short				 cr_req_ptl;

	/** Portal where to wait for reply and where reply would be sent */
@@ -663,7 +663,7 @@ struct ptlrpc_srv_req { 
	/** history sequence # */

	__u64				sr_hist_seq;

	/** the index of service's srv_at_array into which request is linked */

	time_t				sr_at_index;

	time64_t			sr_at_index;

	/** authed uid */

	uid_t				sr_auth_uid;

	/** authed uid mapped to */

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

+1 −1
Original line number Diff line number Diff line
@@ -742,7 +742,7 @@ int ptlrpc_request_bufs_pack(struct ptlrpc_request *request, 


	/* Let's setup deadline for req/reply/bulk unlink for opcode. */

	if (cfs_fail_val == opcode) {

		time_t *fail_t = NULL, *fail2_t = NULL;

		time64_t *fail_t = NULL, *fail2_t = NULL;



		if (CFS_FAIL_CHECK(OBD_FAIL_PTLRPC_LONG_BULK_UNLINK)) {

			fail_t = &request->rq_bulk_deadline;