2015-03-13 21:38:21

by Ameen

[permalink] [raw]
Subject: [PATCH 12/12] crypto/sha-mb/sha1_mb.c : Syntax error

fixing a syntax-error .

Signed-off-by : Ameen Ali <[email protected]>
---
arch/x86/crypto/sha-mb/sha1_mb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/crypto/sha-mb/sha1_mb.c b/arch/x86/crypto/sha-mb/sha1_mb.c
index fd9f6b0..ec0b989 100644
--- a/arch/x86/crypto/sha-mb/sha1_mb.c
+++ b/arch/x86/crypto/sha-mb/sha1_mb.c
@@ -828,7 +828,7 @@ static unsigned long sha1_mb_flusher(struct mcryptd_alg_cstate *cstate)
while (!list_empty(&cstate->work_list)) {
rctx = list_entry(cstate->work_list.next,
struct mcryptd_hash_request_ctx, waiter);
- if time_before(cur_time, rctx->tag.expire)
+ if (time_before(cur_time, rctx->tag.expire))
break;
kernel_fpu_begin();
sha_ctx = (struct sha1_hash_ctx *) sha1_ctx_mgr_flush(cstate->mgr);
--
2.1.0


2015-03-16 10:50:48

by Herbert Xu

[permalink] [raw]
Subject: Re: [PATCH 12/12] crypto/sha-mb/sha1_mb.c : Syntax error

On Fri, Mar 13, 2015 at 11:38:21PM +0200, Ameen Ali wrote:
> fixing a syntax-error .
>
> Signed-off-by : Ameen Ali <[email protected]>

Applied.
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

2015-03-16 11:28:26

by Paul Bolle

[permalink] [raw]
Subject: Re: [PATCH 12/12] crypto/sha-mb/sha1_mb.c : Syntax error

On Mon, 2015-03-16 at 21:50 +1100, Herbert Xu wrote:
> On Fri, Mar 13, 2015 at 11:38:21PM +0200, Ameen Ali wrote:
> > fixing a syntax-error .
> >
> > Signed-off-by : Ameen Ali <[email protected]>
>
> Applied.

The commit summary and the commit explanation are a bit misleading. This
is not a syntax error: it actually compiles just fine with GCC 4.8. (I
looked into that wondering whether this was stable material.) It's
telling that the commit explanation doesn't contain a copy of the error
message, which would have been very helpful if this really was a syntax
error.

The old code apparently works because the preprocessor converts
time_before() into time_after(). And the code generated for time_after()
will in its turn be wrapped in parentheses. That is, this generates
valid syntax by, well, accident. So this could as well be labeled a
style fix. A fix for a rather serious style defect, but still.


Paul Bolle