Skip to contentSkip to conversation

vmalloc.c: fix double error checking

PATCH Superseded Figo.zhang 2 participants 6 messages Jul 7, 2009 – Jul 8, 2009

Subsystems (2)
lore
Share & tools
lore

Figo.zhang

author
#0 lore raw

PATCH 1/1 vmalloc.c: fix double error checking

it is no need for double error checking.

---
mm/vmalloc.c | 9 ++-------

 1 files changed, 2 insertions(+), 7 deletions(-)
mm/vmalloc.c +2 -7
index f8189a4..56b2469 100644
@@ -159,20 +159,15 @@ static int vmap_page_range_noflush(unsigned long start, unsigned long end,
 	pgd_t *pgd;
 	unsigned long next;
 	unsigned long addr = start;
-	int err = 0;
 	int nr = 0;
 
 	BUG_ON(addr >= end);
 	pgd = pgd_offset_k(addr);
 	do {
 		next = pgd_addr_end(addr, end);
-		err = vmap_pud_range(pgd, addr, next, prot, pages, &nr);
-		if (err)
-			break;
+		if (vmap_pud_range(pgd, addr, next, prot, pages, &nr))
+			return -ENOMEM;
 	} while (pgd++, addr = next, addr != end);
-
-	if (unlikely(err))
-		return err;
 	return nr;
 }
 
#1 lore raw

mm/vmalloc.c static int vmap_page_range_noflush(unsigned long start, unsigned long end, · line 169

Quoted 8 lines · Figo.zhang

it is no need for double error checking.

mm/vmalloc.c +2 -3
-		err = vmap_pud_range(pgd, addr, next, prot, pages, &nr);
-		if (err)
-			break;
+		if (vmap_pud_range(pgd, addr, next, prot, pages, &nr))
+			return -ENOMEM;

Wouldn't it be better to keep the error return value?

Thanks.

--
tejun

author
#2 lore raw
Quoted 11 lines · Tejun Heo

mm/vmalloc.c static int vmap_page_range_noflush(unsigned long start, unsigned long end, · line 169

Quoted 8 lines · Figo.zhang

it is no need for double error checking.

mm/vmalloc.c +2 -3
-		err = vmap_pud_range(pgd, addr, next, prot, pages, &nr);
-		if (err)
-			break;
+		if (vmap_pud_range(pgd, addr, next, prot, pages, &nr))
+			return -ENOMEM;

Wouldn't it be better to keep the error return value?

see the vmap_pud_range(), if suceed return 0, if error return "-ENOMEM", so it had better use clearly logic if error directly return "-EOMEM", avoid double checking.

Best,
Figo.zhang

Quoted 5 lines

Thanks.

--
tejun

#3 lore raw
Quoted 12 lines · Figo.zhang
Quoted 10 lines · Tejun Heo

mm/vmalloc.c static int vmap_page_range_noflush(unsigned long start, unsigned long end, · line 169

Quoted 8 lines · Figo.zhang

it is no need for double error checking.

mm/vmalloc.c +2 -3
-		err = vmap_pud_range(pgd, addr, next, prot, pages, &nr);
-		if (err)
-			break;
+		if (vmap_pud_range(pgd, addr, next, prot, pages, &nr))
+			return -ENOMEM;

Wouldn't it be better to keep the error return value?

Quoted 3 lines

see the vmap_pud_range(), if suceed return 0, if error return "-ENOMEM", so it had better use clearly logic if error directly return "-EOMEM", avoid double checking.

Yeah, I saw that but I still think it would be (minutely) better to just pass through the error value. It isn't exclusive with double error checking, just do err = vmap_pud_range(); if (err) return err;

Thanks.

Signature · 1 line
tejun
author
#4 lore raw

PATCH v2 1/1 vmalloc.c: fix double error checking

In reply to Figo.zhang

it is no need for double error checking.

in v2, if vmap_pud_ranger() error, directly return err.

---
mm/vmalloc.c | 4 +---

 1 files changed, 1 insertions(+), 3 deletions(-)
mm/vmalloc.c +0 -0
index f8189a4..ed6b4b9 100644
@@ -168,11 +168,9 @@ static int vmap_page_range_noflush(unsigned long

start, unsigned long end,
next = pgd_addr_end(addr, end);
err = vmap_pud_range(pgd, addr, next, prot, pages, &nr); if (err)
- break;
+ return err;
} while (pgd++, addr = next, addr != end);

- if (unlikely(err))
- return err;
return nr;
}