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

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

staging/lustre/llite: rename ccc_page to vvp_page 



Rename struct ccc_page to struct vvp_page and remove obsolete CCC page
methods.

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


Reviewed-by: default avatarJames Simmons <uja.ornl@gmail.com>
Reviewed-by: default avatarJinshan Xiong <jinshan.xiong@intel.com>
Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8c7b0e1a

drivers/staging/lustre/lustre/include/cl_object.h

+1 −1
Original line number Diff line number Diff line
@@ -769,7 +769,7 @@ struct cl_page { 
/**

 * Per-layer part of cl_page.

 *

 * \see ccc_page, lov_page, osc_page

 * \see vvp_page, lov_page, osc_page

 */

struct cl_page_slice {

	struct cl_page		  *cpl_page;

drivers/staging/lustre/lustre/llite/lcommon_cl.c

+0 −28
Original line number Diff line number Diff line
@@ -257,29 +257,6 @@ static void vvp_object_size_unlock(struct cl_object *obj) 
	ll_inode_size_unlock(inode);

}



/*****************************************************************************

 *

 * Page operations.

 *

 */



int ccc_fail(const struct lu_env *env, const struct cl_page_slice *slice)

{

	/*

	 * Cached read?

	 */

	LBUG();

	return 0;

}



int ccc_transient_page_prep(const struct lu_env *env,

			    const struct cl_page_slice *slice,

			    struct cl_io *unused)

{

	/* transient page should always be sent. */

	return 0;

}



/*****************************************************************************

 *

 * Lock operations.
@@ -614,11 +591,6 @@ struct ccc_req *cl2ccc_req(const struct cl_req_slice *slice) 
	return container_of0(slice, struct ccc_req, crq_cl);

}



struct page *cl2vm_page(const struct cl_page_slice *slice)

{

	return cl2ccc_page(slice)->cpg_page;

}



/**

 * Initialize or update CLIO structures for regular files when new

 * meta-data arrives from the server.

drivers/staging/lustre/lustre/llite/llite_close.c

+6 −6
Original line number Diff line number Diff line
@@ -46,26 +46,26 @@ 
#include "llite_internal.h"



/** records that a write is in flight */

void vvp_write_pending(struct vvp_object *club, struct ccc_page *page)

void vvp_write_pending(struct vvp_object *club, struct vvp_page *page)

{

	struct ll_inode_info *lli = ll_i2info(club->vob_inode);



	spin_lock(&lli->lli_lock);

	lli->lli_flags |= LLIF_SOM_DIRTY;

	if (page && list_empty(&page->cpg_pending_linkage))

		list_add(&page->cpg_pending_linkage, &club->vob_pending_list);

	if (page && list_empty(&page->vpg_pending_linkage))

		list_add(&page->vpg_pending_linkage, &club->vob_pending_list);

	spin_unlock(&lli->lli_lock);

}



/** records that a write has completed */

void vvp_write_complete(struct vvp_object *club, struct ccc_page *page)

void vvp_write_complete(struct vvp_object *club, struct vvp_page *page)

{

	struct ll_inode_info *lli = ll_i2info(club->vob_inode);

	int rc = 0;



	spin_lock(&lli->lli_lock);

	if (page && !list_empty(&page->cpg_pending_linkage)) {

		list_del_init(&page->cpg_pending_linkage);

	if (page && !list_empty(&page->vpg_pending_linkage)) {

		list_del_init(&page->vpg_pending_linkage);

		rc = 1;

	}

	spin_unlock(&lli->lli_lock);

drivers/staging/lustre/lustre/llite/llite_internal.h

+2 −2
Original line number Diff line number Diff line
@@ -828,8 +828,8 @@ struct ll_close_queue { 
	atomic_t		lcq_stop;

};



void vvp_write_pending(struct vvp_object *club, struct ccc_page *page);

void vvp_write_complete(struct vvp_object *club, struct ccc_page *page);

void vvp_write_pending(struct vvp_object *club, struct vvp_page *page);

void vvp_write_complete(struct vvp_object *club, struct vvp_page *page);



/* specific architecture can implement only part of this list */

enum vvp_io_subtype {

drivers/staging/lustre/lustre/llite/rw.c

+7 −7
Original line number Diff line number Diff line
@@ -298,21 +298,21 @@ static int cl_read_ahead_page(const struct lu_env *env, struct cl_io *io, 
			      struct cl_object *clob, pgoff_t *max_index)

{

	struct page *vmpage = page->cp_vmpage;

	struct ccc_page *cp;

	struct vvp_page *vpg;

	int	      rc;



	rc = 0;

	cl_page_assume(env, io, page);

	lu_ref_add(&page->cp_reference, "ra", current);

	cp = cl2ccc_page(cl_object_page_slice(clob, page));

	if (!cp->cpg_defer_uptodate && !PageUptodate(vmpage)) {

	vpg = cl2vvp_page(cl_object_page_slice(clob, page));

	if (!vpg->vpg_defer_uptodate && !PageUptodate(vmpage)) {

		CDEBUG(D_READA, "page index %lu, max_index: %lu\n",

		       ccc_index(cp), *max_index);

		if (*max_index == 0 || ccc_index(cp) > *max_index)

		       vvp_index(vpg), *max_index);

		if (*max_index == 0 || vvp_index(vpg) > *max_index)

			rc = cl_page_is_under_lock(env, io, page, max_index);

		if (rc == 0) {

			cp->cpg_defer_uptodate = 1;

			cp->cpg_ra_used = 0;

			vpg->vpg_defer_uptodate = 1;

			vpg->vpg_ra_used = 0;

			cl_page_list_add(queue, page);

			rc = 1;

		} else {