Return-Path: Message-Id: <20080219144505.490333062@de.ibm.com> References: <20080219144047.587547541@de.ibm.com> Date: Tue, 19 Feb 2008 15:40:58 +0100 From: Martin Schwidefsky Subject: [patch 11/13] dcss: Fix Unlikely(x) != y Content-Disposition: inline; filename=011-dcssblk.diff Sender: linux-kernel-owner@vger.kernel.org List-Archive: List-Post: To: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Gerald Schaefer , Stefan Weinhuber , Carsten Otte , Roel Kluin <12o3l@tiscali.nl>, Heiko Carstens , Martin Schwidefsky List-ID: From: Roel Kluin <12o3l@tiscali.nl> Fix Unlikely(x) != y Cc: Gerald Schaefer Cc: Stefan Weinhuber Cc: Carsten Otte Signed-off-by: Roel Kluin <12o3l@tiscali.nl> Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky --- drivers/s390/block/dcssblk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: quilt-2.6/drivers/s390/block/dcssblk.c =================================================================== --- quilt-2.6.orig/drivers/s390/block/dcssblk.c +++ quilt-2.6/drivers/s390/block/dcssblk.c @@ -666,7 +666,7 @@ dcssblk_make_request(struct request_queu 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) { -- blue skies, Martin. "Reality continues to ruin my life." - Calvin.