[CRIU] [crtools-bot for Cyrill Gorcunov ] parasite: Cleanup get_vma_by_ip

Cyrill Gorcunov gorcunov at openvz.org
Tue Feb 14 08:18:08 EST 2012


The commit is pushed to "master" and will appear on git://github.com/cyrillos/crtools.git
------>
commit 60fc4ed76a2370363d8a6ed225e3b296f2ac71d9
Author: Cyrill Gorcunov <gorcunov at openvz.org>
Date:   Wed Feb 8 20:36:59 2012 +0400

    parasite: Cleanup get_vma_by_ip
    
    Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
    Acked-by: Pavel Emelyanov <xemul at parallels.com>
---
 parasite-syscall.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/parasite-syscall.c b/parasite-syscall.c
index 0cedc12..b2fc926 100644
--- a/parasite-syscall.c
+++ b/parasite-syscall.c
@@ -176,12 +176,12 @@ static struct vma_area *get_vma_by_ip(struct list_head *vma_area_list, unsigned
 	struct vma_area *vma_area;
 
 	list_for_each_entry(vma_area, vma_area_list, list) {
-		if (in_vma_area(vma_area, ip)) {
-			if (vma_area->vma.prot & PROT_EXEC) {
-				if (syscall_fits_vma_area(vma_area))
-					return vma_area;
-			}
-		}
+		if (!in_vma_area(vma_area, ip))
+			continue;
+		if (!(vma_area->vma.prot & PROT_EXEC))
+			continue;
+		if (syscall_fits_vma_area(vma_area))
+			return vma_area;
 	}
 
 	return NULL;


More information about the CRIU mailing list