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

Commit 9ef3754c authored by John L. Hammond's avatar John L. Hammond Committed by Greg Kroah-Hartman
Browse files

staging: lustre: lmv: rename request to preq in lmv_getattr_name() 



Rename request to preq.

Signed-off-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-4826
Reviewed-on: http://review.whamcloud.com/9863


Reviewed-by: default avatarNathaniel Clark <nathaniel.l.clark@intel.com>
Reviewed-by: default avatarBob Glossman <bob.glossman@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 29a85e25

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

+7 −9
Original line number Original line Diff line number Diff line
@@ -1883,7 +1883,7 @@ lmv_enqueue(struct obd_export *exp, struct ldlm_enqueue_info *einfo, 




static int

static int

lmv_getattr_name(struct obd_export *exp, struct md_op_data *op_data,

lmv_getattr_name(struct obd_export *exp, struct md_op_data *op_data,

		 struct ptlrpc_request **request)

		 struct ptlrpc_request **preq)

{

{

	struct ptlrpc_request   *req = NULL;

	struct ptlrpc_request   *req = NULL;

	struct obd_device       *obd = exp->exp_obd;

	struct obd_device       *obd = exp->exp_obd;
@@ -1904,13 +1904,11 @@ lmv_getattr_name(struct obd_export *exp, struct md_op_data *op_data, 
	       op_data->op_namelen, op_data->op_name, PFID(&op_data->op_fid1),

	       op_data->op_namelen, op_data->op_name, PFID(&op_data->op_fid1),

	       tgt->ltd_idx);

	       tgt->ltd_idx);





	rc = md_getattr_name(tgt->ltd_exp, op_data, request);

	rc = md_getattr_name(tgt->ltd_exp, op_data, preq);

	if (rc != 0)

	if (rc != 0)

		return rc;

		return rc;





	body = req_capsule_server_get(&(*request)->rq_pill,

	body = req_capsule_server_get(&(*preq)->rq_pill, &RMF_MDT_BODY);

				      &RMF_MDT_BODY);



	if (body->valid & OBD_MD_MDS) {

	if (body->valid & OBD_MD_MDS) {

		struct lu_fid rid = body->fid1;

		struct lu_fid rid = body->fid1;
@@ -1919,8 +1917,8 @@ lmv_getattr_name(struct obd_export *exp, struct md_op_data *op_data, 




		tgt = lmv_find_target(lmv, &rid);

		tgt = lmv_find_target(lmv, &rid);

		if (IS_ERR(tgt)) {

		if (IS_ERR(tgt)) {

			ptlrpc_req_finished(*request);

			ptlrpc_req_finished(*preq);

			*request = NULL;

			*preq = NULL;

			return PTR_ERR(tgt);

			return PTR_ERR(tgt);

		}

		}
@@ -1929,8 +1927,8 @@ lmv_getattr_name(struct obd_export *exp, struct md_op_data *op_data, 
		op_data->op_namelen = 0;

		op_data->op_namelen = 0;

		op_data->op_name = NULL;

		op_data->op_name = NULL;

		rc = md_getattr_name(tgt->ltd_exp, op_data, &req);

		rc = md_getattr_name(tgt->ltd_exp, op_data, &req);

		ptlrpc_req_finished(*request);

		ptlrpc_req_finished(*preq);

		*request = req;

		*preq = req;

	}

	}





	return rc;

	return rc;