Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755609AbYBPQQn (ORCPT ); Sat, 16 Feb 2008 11:16:43 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754352AbYBPQQb (ORCPT ); Sat, 16 Feb 2008 11:16:31 -0500 Received: from smtp-out3.tiscali.nl ([195.241.79.178]:55147 "EHLO smtp-out3.tiscali.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754042AbYBPQQa (ORCPT ); Sat, 16 Feb 2008 11:16:30 -0500 Message-ID: <47B70C5A.8070202@tiscali.nl> Date: Sat, 16 Feb 2008 17:16:26 +0100 From: Roel Kluin <12o3l@tiscali.nl> User-Agent: Thunderbird 2.0.0.9 (X11/20071031) MIME-Version: 1.0 To: schwidefsky@de.ibm.com, Heiko Carstens , linux390@de.ibm.com CC: linux-s390@vger.kernel.org, lkml Subject: [PATCH 3/3] drivers/s390/block/dcssblk.c: Fix Unlikely(x) != y Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1012 Lines: 24 The patch below was not yet tested. If it's correct as it is, please comment. --- Fix Unlikely(x) != y Signed-off-by: Roel Kluin <12o3l@tiscali.nl> --- diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c index 3faf053..e6c94db 100644 --- a/drivers/s390/block/dcssblk.c +++ b/drivers/s390/block/dcssblk.c @@ -666,7 +666,7 @@ dcssblk_make_request(struct request_queue *q, struct bio *bio) page_addr = (unsigned long) page_address(bvec->bv_page) + bvec->bv_offset; source_addr = dev_info->start + (index<<12) + bytes_done; - if (unlikely(page_addr & 4095) != 0 || (bvec->bv_len & 4095) != 0) + if (unlikely((page_addr & 4095) != 0) || (bvec->bv_len & 4095) != 0) // More paranoia. goto fail; if (bio_data_dir(bio) == READ) { -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/