2008-12-21 15:37:30

by Julia Lawall

Subject: [PATCH 3/13] drivers/infiniband/hw/ehca: Remove redundant test

From: Julia Lawall <[email protected]>

vpage is checked not to be NULL just after it is initialized at the
beginning of each loop iteration.

A simplified version of the semantic patch that makes this change is as
follows: (http://www.emn.fr/x-info/coccinelle/)

// <smpl>
@r exists@
local idexpression x;
expression E;
position p1,p2;
@@

if (x@p1 == NULL || ...) { ... when forall
return ...; }
... when != \(x=E\|x--\|x++\|--x\|++x\|x-=E\|x+=E\|x|=E\|x&=E\|&x\)
(
x@p2 == NULL
|
x@p2 != NULL
)

// another path to the test that is not through p1?
@s exists@
local idexpression r.x;
position r.p1,r.p2;
@@

... when != x@p1
(
x@p2 == NULL
|
x@p2 != NULL
)

@fix depends on !s@
position r.p1,r.p2;
expression x,E;
statement S1,S2;
@@

(
- if ((x@p2 != NULL) || ...)
S1
|
- if ((x@p2 == NULL) && ...) S1
|
- BUG_ON(x@p2 == NULL);
)
// </smpl>

Signed-off-by: Julia Lawall <[email protected]>

---
drivers/infiniband/hw/ehca/ehca_eq.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/infiniband/hw/ehca/ehca_eq.c b/drivers/infiniband/hw/ehca/ehca_eq.c
index 49660df..523e733 100644
--- a/drivers/infiniband/hw/ehca/ehca_eq.c
+++ b/drivers/infiniband/hw/ehca/ehca_eq.c
@@ -113,7 +113,7 @@ int ehca_create_eq(struct ehca_shca *shca,
if (h_ret != H_SUCCESS || vpage)
goto create_eq_exit2;
} else {
- if (h_ret != H_PAGE_REGISTERED || !vpage)
+ if (h_ret != H_PAGE_REGISTERED)
goto create_eq_exit2;
}
}

2008-12-21 21:28:18

by Roland Dreier

Subject: Re: [PATCH 3/13] drivers/infiniband/hw/ehca: Remove redundant test

Thanks, applied for 2.6.29 (ehca guys added to cc list just to make sure
this is OK).

- R.

2009-01-13 17:26:16

by Hoang-Nam Nguyen

Subject: Re: [PATCH 3/13] drivers/infiniband/hw/ehca: Remove redundant test

Thanks
Nam

Roland Dreier <[email protected]> wrote on 21.12.2008 22:27:57:

> Thanks, applied for 2.6.29 (ehca guys added to cc list just to make sure
> this is OK).
>
> - R.