Skip to contentSkip to conversation

mm: use the existing variable instead of a duplicate statement

PATCH In review Hao Lee 4 participants 6 messages Nov 25, 2019 – Nov 28, 2019

Subsystems (3)
lore
Share & tools
lore

Hao Lee

author
#0 lore raw

PATCH 1/1 mm: use the existing variable instead of a duplicate statement

The address of zone has been stored in variable 'zone', so there is no need to get it again with a duplicate statement.

---
 mm/vmscan.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
mm/vmscan.c +1 -2
index ee4eecc7e1c2..de4b2d1e66be 100644
@@ -363,22 +363,21 @@ unsigned long lruvec_lru_size(struct lruvec *lruvec, enum lru_list lru, int zone
 	for (zid = zone_idx + 1; zid < MAX_NR_ZONES; zid++) {
 		struct zone *zone = &lruvec_pgdat(lruvec)->node_zones[zid];
 		unsigned long size;
 
 		if (!managed_zone(zone))
 			continue;
 
 		if (!mem_cgroup_disabled())
 			size = mem_cgroup_get_zone_lru_size(lruvec, lru, zid);
 		else
-			size = zone_page_state(&lruvec_pgdat(lruvec)->node_zones[zid],
-				       NR_ZONE_LRU_BASE + lru);
+			size = zone_page_state(zone, NR_ZONE_LRU_BASE + lru);
 		lru_size -= min(size, lru_size);
 	}
 
 	return lru_size;
 
 }
 
 /*
  * Add a shrinker callback to be called from the vm.
  */
Signature · 1 line
2.14.5
Reviewed-by on v1 1/1
#2 lore raw
In reply to Hao Lee
Quoted 27 lines · Hao Lee

The address of zone has been stored in variable 'zone', so there is no need to get it again with a duplicate statement.

---
 mm/vmscan.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
mm/vmscan.c +1 -2
index ee4eecc7e1c2..de4b2d1e66be 100644
@@ -363,22 +363,21 @@ unsigned long lruvec_lru_size(struct lruvec *lruvec, enum lru_list lru, int zone
 	for (zid = zone_idx + 1; zid < MAX_NR_ZONES; zid++) {
 		struct zone *zone = &lruvec_pgdat(lruvec)->node_zones[zid];
 		unsigned long size;
 
 		if (!managed_zone(zone))
 			continue;
 
 		if (!mem_cgroup_disabled())
 			size = mem_cgroup_get_zone_lru_size(lruvec, lru, zid);
 		else
-			size = zone_page_state(&lruvec_pgdat(lruvec)->node_zones[zid],
-				       NR_ZONE_LRU_BASE + lru);
+			size = zone_page_state(zone, NR_ZONE_LRU_BASE + lru);

mm/vmscan.c unsigned long lruvec_lru_size(struct lruvec *lruvec, enum lru_list lru, int zone · line 383

Quoted 10 lines
mm/vmscan.c +0 -0
 		lru_size -= min(size, lru_size);
 	}
 
 	return lru_size;
 
 }
 
 /*
  * Add a shrinker callback to be called from the vm.
  */

Maybe tweak the subject to something meaningful:

"mm/vmscan: reuse stored zone in lruvec_lru_size()"

Signature · 3 lines
Thanks,

David / dhildenb
author
#3 lore raw
Quoted 26 lines · David Hildenbrand
Quoted 24 lines · Hao Lee

The address of zone has been stored in variable 'zone', so there is no need to get it again with a duplicate statement.

mm/vmscan.c +1 -2
@@ -363,22 +363,21 @@ unsigned long lruvec_lru_size(struct lruvec *lruvec, enum lru_list lru, int zone
      for (zid = zone_idx + 1; zid < MAX_NR_ZONES; zid++) {
              struct zone *zone = &lruvec_pgdat(lruvec)->node_zones[zid];
              unsigned long size;
 
              if (!managed_zone(zone))
                      continue;
 
              if (!mem_cgroup_disabled())
                      size = mem_cgroup_get_zone_lru_size(lruvec, lru, zid);
              else
-                     size = zone_page_state(&lruvec_pgdat(lruvec)->node_zones[zid],
-                                    NR_ZONE_LRU_BASE + lru);
+                     size = zone_page_state(zone, NR_ZONE_LRU_BASE + lru);
              lru_size -= min(size, lru_size);
      }
 
      return lru_size;
 
Quoted 8 lines

mm/vmscan.c unsigned long lruvec_lru_size(struct lruvec *lruvec, enum lru_list lru, int zone · line 379

Quoted 1 line
mm/vmscan.c +0 -0
 }

Maybe tweak the subject to something meaningful:

"mm/vmscan: reuse stored zone in lruvec_lru_size()"

Thanks. I get it!

Regards,
Hao Lee

#4 lore raw
In reply to Hao Lee
Quoted 16 lines · Hao Lee

The address of zone has been stored in variable 'zone', so there is no need to get it again with a duplicate statement.

---
 mm/vmscan.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
mm/vmscan.c +0 -0
index ee4eecc7e1c2..de4b2d1e66be 100644
@@ -363,22 +363,21 @@ unsigned long lruvec_lru_size(struct lruvec *lruvec, enum lru_list lru, int zone
 	for (zid = zone_idx + 1; zid < MAX_NR_ZONES; zid++) {
 		struct zone *zone = &lruvec_pgdat(lruvec)->node_zones[zid];
 		unsigned long size;

mm/vmscan.c unsigned long lruvec_lru_size(struct lruvec *lruvec, enum lru_list lru, int zone · line 373

Quoted 10 lines
mm/vmscan.c +1 -2
 
 		if (!managed_zone(zone))
 			continue;
 
 		if (!mem_cgroup_disabled())
 			size = mem_cgroup_get_zone_lru_size(lruvec, lru, zid);
 		else
-			size = zone_page_state(&lruvec_pgdat(lruvec)->node_zones[zid],
-				       NR_ZONE_LRU_BASE + lru);
+			size = zone_page_state(zone, NR_ZONE_LRU_BASE + lru);

Is not this already merged with following commit on next-20191126 ?

54eacdb0dd8f9a ("mm: vmscan: simplify lruvec_lru_size()")

Quoted 11 lines
mm/vmscan.c +0 -0
 		lru_size -= min(size, lru_size);
 	}
 
 	return lru_size;
 
 }
 
 /*
  * Add a shrinker callback to be called from the vm.
  */
author
#5 lore raw
Quoted 22 lines · Anshuman Khandual
Quoted 9 lines
mm/vmscan.c +0 -0
index ee4eecc7e1c2..de4b2d1e66be 100644
@@ -363,22 +363,21 @@ unsigned long lruvec_lru_size(struct lruvec *lruvec, enum lru_list lru, int zone
      for (zid = zone_idx + 1; zid < MAX_NR_ZONES; zid++) {
              struct zone *zone = &lruvec_pgdat(lruvec)->node_zones[zid];
              unsigned long size;

mm/vmscan.c unsigned long lruvec_lru_size(struct lruvec *lruvec, enum lru_list lru, int zone · line 373

Quoted 10 lines
mm/vmscan.c +1 -2
 
              if (!managed_zone(zone))
                      continue;
 
              if (!mem_cgroup_disabled())
                      size = mem_cgroup_get_zone_lru_size(lruvec, lru, zid);
              else
-                     size = zone_page_state(&lruvec_pgdat(lruvec)->node_zones[zid],
-                                    NR_ZONE_LRU_BASE + lru);
+                     size = zone_page_state(zone, NR_ZONE_LRU_BASE + lru);

Is not this already merged with following commit on next-20191126 ?

Quoted 1 line

54eacdb0dd8f9a ("mm: vmscan: simplify lruvec_lru_size()")

Yes...That's really a coincidence... I use torvalds' tree to develop but never think this function has been refactored on next tree just a few days ago. Thank you.

Regards,
Hao Lee