[06/10] hugetlb: pass NULL to kobj_to_hstate() if nid is unused

Commit Message

Miaohe Lin Aug. 26, 2022, 9:24 a.m. UTC

We can pass NULL to kobj_to_hstate() directly when nid is unused to
simplify the code. No functional change intended.

Signed-off-by: Miaohe Lin <[e-mail]>
---
 mm/hugetlb.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

Muchun Song Aug. 27, 2022, 1:49 a.m. UTC | #1

> On Aug 26, 2022, at 17:24, Miaohe Lin <[e-mail]> wrote:
> 
> We can pass NULL to kobj_to_hstate() directly when nid is unused to
> simplify the code. No functional change intended.
> 
> Signed-off-by: Miaohe Lin <[e-mail]>

Reviewed-by: Muchun Song <[e-mail]>

Thanks.

Patch

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 6ea9f73aea84..58eeae934e09 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -3779,8 +3779,7 @@  HSTATE_ATTR_WO(demote);
 static ssize_t demote_size_show(struct kobject *kobj,
 					struct kobj_attribute *attr, char *buf)
 {
-	int nid;
-	struct hstate *h = kobj_to_hstate(kobj, &nid);
+	struct hstate *h = kobj_to_hstate(kobj, NULL);
 	unsigned long demote_size = (PAGE_SIZE << h->demote_order) / SZ_1K;
 
 	return sysfs_emit(buf, "%lukB\n", demote_size);
@@ -3793,7 +3792,6 @@  static ssize_t demote_size_store(struct kobject *kobj,
 	struct hstate *h, *demote_hstate;
 	unsigned long demote_size;
 	unsigned int demote_order;
-	int nid;
 
 	demote_size = (unsigned long)memparse(buf, NULL);
 
@@ -3805,7 +3803,7 @@  static ssize_t demote_size_store(struct kobject *kobj,
 		return -EINVAL;
 
 	/* demote order must be smaller than hstate order */
-	h = kobj_to_hstate(kobj, &nid);
+	h = kobj_to_hstate(kobj, NULL);
 	if (demote_order >= h->order)
 		return -EINVAL;