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

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

staging/lustre/llite: change it_data to it_request 



Change the void *it_data member of struct lookup_intent to struct
ptlrpc_request *it_request.

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


Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarJames Simmons <uja.ornl@yahoo.com>
Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 51b39f1d

drivers/staging/lustre/lustre/include/lustre_intent.h

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ struct lookup_intent { 
	int		it_lock_mode;

	int		it_remote_lock_mode;

	__u64	   it_remote_lock_handle;

	void	   *it_data;

	struct ptlrpc_request *it_request;

	unsigned int    it_lock_set:1;

};

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

+3 −3
Original line number Diff line number Diff line
@@ -233,13 +233,13 @@ void ll_intent_release(struct lookup_intent *it) 
	ll_intent_drop_lock(it);

	/* We are still holding extra reference on a request, need to free it */

	if (it_disposition(it, DISP_ENQ_OPEN_REF))

		ptlrpc_req_finished(it->it_data); /* ll_file_open */

		ptlrpc_req_finished(it->it_request); /* ll_file_open */



	if (it_disposition(it, DISP_ENQ_CREATE_REF)) /* create rec */

		ptlrpc_req_finished(it->it_data);

		ptlrpc_req_finished(it->it_request);



	it->it_disposition = 0;

	it->it_data = NULL;

	it->it_request = NULL;

}



void ll_invalidate_aliases(struct inode *inode)

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

+1 −1
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ struct page *ll_get_dir_page(struct inode *dir, __u64 hash, 


		ll_finish_md_op_data(op_data);



		request = (struct ptlrpc_request *)it.it_data;

		request = (struct ptlrpc_request *)it.it_request;

		if (request)

			ptlrpc_req_finished(request);

		if (rc < 0) {

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

+8 −9
Original line number Diff line number Diff line
@@ -464,10 +464,9 @@ void ll_ioepoch_open(struct ll_inode_info *lli, __u64 ioepoch) 
static int ll_och_fill(struct obd_export *md_exp, struct lookup_intent *it,

		       struct obd_client_handle *och)

{

	struct ptlrpc_request *req = it->it_data;

	struct mdt_body *body;



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

	body = req_capsule_server_get(&it->it_request->rq_pill, &RMF_MDT_BODY);

	och->och_fh = body->handle;

	och->och_fid = body->fid1;

	och->och_lease_handle.cookie = it->it_lock_handle;
@@ -488,7 +487,6 @@ static int ll_local_open(struct file *file, struct lookup_intent *it, 
	LASSERT(fd);



	if (och) {

		struct ptlrpc_request *req = it->it_data;

		struct mdt_body *body;

		int rc;
@@ -496,7 +494,8 @@ static int ll_local_open(struct file *file, struct lookup_intent *it, 
		if (rc != 0)

			return rc;



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

		body = req_capsule_server_get(&it->it_request->rq_pill,

					      &RMF_MDT_BODY);

		ll_ioepoch_open(lli, body->ioepoch);

	}
@@ -713,7 +712,7 @@ int ll_file_open(struct inode *inode, struct file *file) 
	}



	if (it && it_disposition(it, DISP_ENQ_OPEN_REF)) {

		ptlrpc_req_finished(it->it_data);

		ptlrpc_req_finished(it->it_request);

		it_clear_disposition(it, DISP_ENQ_OPEN_REF);

	}
@@ -1401,7 +1400,7 @@ int ll_lov_setstripe_ea_info(struct inode *inode, struct dentry *dentry, 
out:

	return rc;

out_req_free:

	ptlrpc_req_finished((struct ptlrpc_request *)oit.it_data);

	ptlrpc_req_finished((struct ptlrpc_request *)oit.it_request);

	goto out;

}
@@ -1689,7 +1688,7 @@ int ll_release_openhandle(struct inode *inode, struct lookup_intent *it) 
out:

	/* this one is in place of ll_file_open */

	if (it_disposition(it, DISP_ENQ_OPEN_REF)) {

		ptlrpc_req_finished(it->it_data);

		ptlrpc_req_finished(it->it_request);

		it_clear_disposition(it, DISP_ENQ_OPEN_REF);

	}

	return rc;
@@ -3595,8 +3594,8 @@ int ll_layout_refresh(struct inode *inode, __u32 *gen) 


	rc = md_enqueue(sbi->ll_md_exp, &einfo, &it, op_data, &lockh,

			NULL, 0, NULL, 0);

	ptlrpc_req_finished(it.it_data);

	it.it_data = NULL;

	ptlrpc_req_finished(it.it_request);

	it.it_request = NULL;



	ll_finish_md_op_data(op_data);

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

+1 −1
Original line number Diff line number Diff line
@@ -659,7 +659,7 @@ static struct inode *ll_create_node(struct inode *dir, struct lookup_intent *it) 
	LASSERT(it && it->it_disposition);



	LASSERT(it_disposition(it, DISP_ENQ_CREATE_REF));

	request = it->it_data;

	request = it->it_request;

	it_clear_disposition(it, DISP_ENQ_CREATE_REF);

	rc = ll_prep_inode(&inode, request, dir->i_sb, it);

	if (rc) {