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

Commit 63a46519 authored by Ben Evans's avatar Ben Evans Committed by Greg Kroah-Hartman
Browse files

staging/lustre/ptlrpc: Remove __ptlrpc_request_bufs_pack 



Combine __ptlrpc_request_bufs_pack into ptlrpc_request_bufs_pack
because it was an unnecessary wrapper otherwise.

Signed-off-by: default avatarBen Evans <bevans@cray.com>
Reviewed-on: http://review.whamcloud.com/16765
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-7269


Reviewed-by: default avatarFrank Zago <fzago@cray.com>
Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Reviewed-by: default avatarChris Horn <hornc@cray.com>
Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent af38abfc

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

+13 −21
Original line number Diff line number Diff line
@@ -583,14 +583,19 @@ static void __ptlrpc_free_req_to_pool(struct ptlrpc_request *request) 
	spin_unlock(&pool->prp_lock);

}



static int __ptlrpc_request_bufs_pack(struct ptlrpc_request *request,

				      __u32 version, int opcode,

				      int count, __u32 *lengths, char **bufs,

int ptlrpc_request_bufs_pack(struct ptlrpc_request *request,

			     __u32 version, int opcode, char **bufs,

			     struct ptlrpc_cli_ctx *ctx)

{

	struct obd_import *imp = request->rq_import;

	int count;

	struct obd_import *imp;

	__u32 *lengths;

	int rc;



	count = req_capsule_filled_sizes(&request->rq_pill, RCL_CLIENT);

	imp = request->rq_import;

	lengths = request->rq_pill.rc_area[RCL_CLIENT];



	if (unlikely(ctx)) {

		request->rq_cli_ctx = sptlrpc_cli_ctx_get(ctx);

	} else {
@@ -598,15 +603,12 @@ static int __ptlrpc_request_bufs_pack(struct ptlrpc_request *request, 
		if (rc)

			goto out_free;

	}



	sptlrpc_req_set_flavor(request, opcode);



	rc = lustre_pack_request(request, imp->imp_msg_magic, count,

				 lengths, bufs);

	if (rc) {

		LASSERT(!request->rq_pool);

	if (rc)

		goto out_ctx;

	}



	lustre_msg_add_version(request->rq_reqmsg, version);

	request->rq_send_state = LUSTRE_IMP_FULL;
@@ -631,24 +633,14 @@ static int __ptlrpc_request_bufs_pack(struct ptlrpc_request *request, 
	lustre_msg_set_opc(request->rq_reqmsg, opcode);



	return 0;



out_ctx:

	LASSERT(!request->rq_pool);

	sptlrpc_cli_ctx_put(request->rq_cli_ctx, 1);

out_free:

	class_import_put(imp);

	return rc;

}



int ptlrpc_request_bufs_pack(struct ptlrpc_request *request,

			     __u32 version, int opcode, char **bufs,

			     struct ptlrpc_cli_ctx *ctx)

{

	int count;



	count = req_capsule_filled_sizes(&request->rq_pill, RCL_CLIENT);

	return __ptlrpc_request_bufs_pack(request, version, opcode, count,

					  request->rq_pill.rc_area[RCL_CLIENT],

					  bufs, ctx);

}

EXPORT_SYMBOL(ptlrpc_request_bufs_pack);



/**