Commit 0093de69 authored by Yixuan Cao's avatar Yixuan Cao Committed by Linus Torvalds
Browse files

mm/page_owner.c: modify the type of argument "order" in some functions 

The type of "order" in struct page_owner is unsigned short.
However, it is unsigned int in the following 3 functions:

  __reset_page_owner
  __set_page_owner_handle
  __set_page_owner_handle

The type of "order" in argument list is unsigned int, which is
inconsistent.

[akpm@linux-foundation.org: update include/linux/page_owner.h]

Link: https://lkml.kernel.org/r/20211020125945.47792-1-caoyixuan2019@email.szu.edu.cn


Signed-off-by: default avatarYixuan Cao <caoyixuan2019@email.szu.edu.cn>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent debe436e

include/linux/page_owner.h

+6 −6
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ 
extern struct static_key_false page_owner_inited;

extern struct page_ext_operations page_owner_ops;



extern void __reset_page_owner(struct page *page, unsigned int order);

extern void __reset_page_owner(struct page *page, unsigned short order);

extern void __set_page_owner(struct page *page,

			unsigned int order, gfp_t gfp_mask);

			unsigned short order, gfp_t gfp_mask);

extern void __split_page_owner(struct page *page, unsigned int nr);

extern void __folio_copy_owner(struct folio *newfolio, struct folio *old);

extern void __set_page_owner_migrate_reason(struct page *page, int reason);
@@ -18,14 +18,14 @@ extern void __dump_page_owner(const struct page *page); 
extern void pagetypeinfo_showmixedcount_print(struct seq_file *m,

					pg_data_t *pgdat, struct zone *zone);



static inline void reset_page_owner(struct page *page, unsigned int order)

static inline void reset_page_owner(struct page *page, unsigned short order)

{

	if (static_branch_unlikely(&page_owner_inited))

		__reset_page_owner(page, order);

}



static inline void set_page_owner(struct page *page,

			unsigned int order, gfp_t gfp_mask)

			unsigned short order, gfp_t gfp_mask)

{

	if (static_branch_unlikely(&page_owner_inited))

		__set_page_owner(page, order, gfp_mask);
@@ -52,7 +52,7 @@ static inline void dump_page_owner(const struct page *page) 
		__dump_page_owner(page);

}

#else

static inline void reset_page_owner(struct page *page, unsigned int order)

static inline void reset_page_owner(struct page *page, unsigned short order)

{

}

static inline void set_page_owner(struct page *page,
@@ -60,7 +60,7 @@ static inline void set_page_owner(struct page *page, 
{

}

static inline void split_page_owner(struct page *page,

			unsigned int order)

			unsigned short order)

{

}

static inline void folio_copy_owner(struct folio *newfolio, struct folio *folio)

mm/page_owner.c

+3 −3
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static noinline depot_stack_handle_t save_stack(gfp_t flags) 
	return handle;

}



void __reset_page_owner(struct page *page, unsigned int order)

void __reset_page_owner(struct page *page, unsigned short order)

{

	int i;

	struct page_ext *page_ext;
@@ -149,7 +149,7 @@ void __reset_page_owner(struct page *page, unsigned int order) 


static inline void __set_page_owner_handle(struct page_ext *page_ext,

					depot_stack_handle_t handle,

					unsigned int order, gfp_t gfp_mask)

					unsigned short order, gfp_t gfp_mask)

{

	struct page_owner *page_owner;

	int i;
@@ -169,7 +169,7 @@ static inline void __set_page_owner_handle(struct page_ext *page_ext, 
	}

}



noinline void __set_page_owner(struct page *page, unsigned int order,

noinline void __set_page_owner(struct page *page, unsigned short order,

					gfp_t gfp_mask)

{

	struct page_ext *page_ext = lookup_page_ext(page);