Skip to contentSkip to conversation

kexec: Remove the unnecessary conditional judgement to simplify the code logic

PATCH In review Minfei Huang 4 participants 5 messages Jul 28, 2015 – Aug 13, 2015

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kexec: Remove the unnecessary conditional judgement to simplify the code logic

Transforming PFN(Page Frame Number) to struct page is never failure, so we can simplify the code logic to do the image->control_page assignment directly in the loop, and remove the unnecessary conditional judgement.

---
 kernel/kexec.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
kernel/kexec.c +1 -2
index 6f1ed75..cf82474 100644
@@ -807,11 +807,10 @@ static struct page *kimage_alloc_crash_control_pages(struct kimage *image,
 		/* If I don't overlap any segments I have found my hole! */
 		if (i == image->nr_segments) {
 			pages = pfn_to_page(hole_start >> PAGE_SHIFT);
+			image->control_page = hole_end;
 			break;
 		}
 	}
-	if (pages)
-		image->control_page = hole_end;
 
 	return pages;
 }
Signature · 1 line
2.4.0
#1 lore raw
Quoted 7 lines · Minfei Huang

Transforming PFN(Page Frame Number) to struct page is never failure, so we can simplify the code logic to do the image->control_page assignment directly in the loop, and remove the unnecessary conditional judgement.

Andrew, could you consider picking this up.
It seems to have been sufficiently reviewed, acked, etc...

Quoted 30 lines
---
 kernel/kexec.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
kernel/kexec.c +1 -2
index 6f1ed75..cf82474 100644
@@ -807,11 +807,10 @@ static struct page *kimage_alloc_crash_control_pages(struct kimage *image,
 		/* If I don't overlap any segments I have found my hole! */
 		if (i == image->nr_segments) {
 			pages = pfn_to_page(hole_start >> PAGE_SHIFT);
+			image->control_page = hole_end;
 			break;
 		}
 	}
-	if (pages)
-		image->control_page = hole_end;
 
 	return pages;
 }
Signature · 7 lines
2.4.0


_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
#2 lore raw
Quoted 11 lines · Simon Horman
Quoted 7 lines · Minfei Huang

Transforming PFN(Page Frame Number) to struct page is never failure, so we can simplify the code logic to do the image->control_page assignment directly in the loop, and remove the unnecessary conditional judgement.

Andrew, could you consider picking this up.
It seems to have been sufficiently reviewed, acked, etc...

I saw this has been in linux-next tree.

commit b90b6ef0f152ef42fe66ce5c9ccf2783ea84fa69

Author: Minfei Huang <[email protected]>
Date:   Thu Jul 30 09:56:18 2015 +1000

kexec: remove unnecessary test in kimage_alloc_crash_control_pages()

Thanks
Baoquan

#3 lore raw
Quoted 6 lines · Baoquan He
Quoted 5 lines · Simon Horman
Quoted 4 lines · Minfei Huang

Transforming PFN(Page Frame Number) to struct page is never failure, so we can simplify the code logic to do the image->control_page assignment directly in the loop, and remove the unnecessary conditional judgement.

Quoted 8 lines
Quoted 6 lines
Quoted 3 lines

Andrew, could you consider picking this up.
It seems to have been sufficiently reviewed, acked, etc...

I saw this has been in linux-next tree.

Excellent, sorry for the noise.

Quoted 9 lines

commit b90b6ef0f152ef42fe66ce5c9ccf2783ea84fa69

Author: Minfei Huang <[email protected]>
Date:   Thu Jul 30 09:56:18 2015 +1000

kexec: remove unnecessary test in kimage_alloc_crash_control_pages()

Thanks
Baoquan

maintainer
#4 lore raw
In reply to Simon Horman
Quoted 11 lines · On Thu, 13 Aug 2015 09:55:25 +0900 Simon Horman <[email protected]> wrote:
Quoted 7 lines · Minfei Huang

Transforming PFN(Page Frame Number) to struct page is never failure, so we can simplify the code logic to do the image->control_page assignment directly in the loop, and remove the unnecessary conditional judgement.

Andrew, could you consider picking this up.
It seems to have been sufficiently reviewed, acked, etc...

I grabbed this one of July 28.
http://ozlabs.org/~akpm/mmotm/broken-out/kexec-remove-the-unnecessary-conditional-judgement-to-simplify-the-code-logic.patch