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

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

staging: lustre: libcfs: remove page_index() macro 



Just use the index field directly for struct page.

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


Reviewed-by: default avatarfrank zago <fzago@cray.com>
Reviewed-by: default avatarDmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bd6e2c50

drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h

+0 −2
Original line number Diff line number Diff line
@@ -57,8 +57,6 @@ 
#include "../libcfs_cpu.h"

#endif



#define page_index(p)       ((p)->index)



#if BITS_PER_LONG == 32

/* limit to lowmem on 32-bit systems */

#define NUM_CACHEPAGES \

drivers/staging/lustre/lustre/llite/vvp_page.c

+1 −1
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ static int vvp_page_print(const struct lu_env *env, 
		(*printer)(env, cookie, "%lx %d:%d %lx %lu %slru",

			   (long)vmpage->flags, page_count(vmpage),

			   page_mapcount(vmpage), vmpage->private,

			   page_index(vmpage),

			   vmpage->index,

			   list_empty(&vmpage->lru) ? "not-" : "");

	}

drivers/staging/lustre/lustre/osc/osc_request.c

+1 −1
Original line number Diff line number Diff line
@@ -1934,7 +1934,7 @@ int osc_build_rpc(const struct lu_env *env, struct client_obd *cli, 
		pga[i] = &oap->oap_brw_page;

		pga[i]->off = oap->oap_obj_off + oap->oap_page_off;

		CDEBUG(0, "put page %p index %lu oap %p flg %x to pga\n",

		       pga[i]->pg, page_index(oap->oap_page), oap,

		       pga[i]->pg, oap->oap_page->index, oap,

		       pga[i]->flag);

		i++;

		cl_req_page_add(env, clerq, page);