From patchwork Tue Jan 2 10:34:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10140263 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CBF6D60362 for ; Tue, 2 Jan 2018 10:36:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9F63028AC0 for ; Tue, 2 Jan 2018 10:36:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 941DD28AC2; Tue, 2 Jan 2018 10:36:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from userp2130.oracle.com (userp2130.oracle.com [156.151.31.86]) (using TLSv1.2 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4EC5E28AC0 for ; Tue, 2 Jan 2018 10:36:49 +0000 (UTC) Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.21/8.16.0.21) with SMTP id w02AWTOb147740; Tue, 2 Jan 2018 10:36:36 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : date : message-id : cc : subject : list-id : list-unsubscribe : list-archive : list-post : list-help : list-subscribe : mime-version : content-type : content-transfer-encoding : sender; s=corp-2017-10-26; bh=NMbO1By3RKAn0tNamTj18COF40Rd6XHVG9K7+1AWPzI=; b=Ub1R+HHBkxmbI+N1UFsDgGYldrlwzG5mfNcKJfeQfbzdEH6l8NzOOMM/cTdt1CiaUc+R rLDzjr/E92czzzJUte8U2f0jBdV5gJ2Eyw32ne/ocw0SinjcHGQ890PvPZh4LSLu8KAa 3ADvZChXwL37b96SpcPBMze4wlG0Xv/Ses5kDKTbkdNyNyCi1u6vvBLTi0hSoH98Wkr4 U4wKuuD97FE63QvTuTexQ2bEI0VgiicZoRX1b+MHb1akI57kc34zmLJ6uXog2gdvhixr bPaDv931O026CKG2j+PUkuUSNw04Aq/kiSz9R2MfbYL6SSYXmnJiWQ2Ie6piXvGL10Lp 0g== Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp2130.oracle.com with ESMTP id 2f885sg24r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 02 Jan 2018 10:36:35 +0000 Received: from oss.oracle.com (oss-old-reserved.oracle.com [137.254.22.2]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w02AaDJf015961 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 2 Jan 2018 10:36:14 GMT Received: from localhost ([127.0.0.1] helo=lb-oss.oracle.com) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1eWJvZ-00088R-NA; Tue, 02 Jan 2018 02:36:13 -0800 Received: from aserv0022.oracle.com ([141.146.126.234]) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1eWJvA-00086q-Jl for ocfs2-devel@oss.oracle.com; Tue, 02 Jan 2018 02:35:49 -0800 Received: from userp2040.oracle.com (userp2040.oracle.com [156.151.31.90]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id w02AZj8D017499 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=FAIL) for ; Tue, 2 Jan 2018 10:35:46 GMT Received: from pps.filterd (userp2040.oracle.com [127.0.0.1]) by userp2040.oracle.com (8.16.0.21/8.16.0.21) with SMTP id w02AWJZ4033576 for ; Tue, 2 Jan 2018 10:35:45 GMT Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.130]) by userp2040.oracle.com with ESMTP id 2f7p81jarh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=OK) for ; Tue, 02 Jan 2018 10:35:45 +0000 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.129]) with ESMTPA (Nemesis) id 0M53la-1eqloQ1mPO-00zHHI; Tue, 02 Jan 2018 11:35:24 +0100 From: Arnd Bergmann To: Andrew Morton , Mark Fasheh , Joel Becker Date: Tue, 2 Jan 2018 11:34:42 +0100 Message-Id: <20180102103520.865665-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:iEuVZ8sn3fdmK0zBu/g+trNRCf+JmMsAduUnNimzVaSG2TUfcq7 DQwZQJiakn5PHEQ1nR1OCDGXhSZ+jk01ecFtDocDXWbHvOYXzp0dqujSsr5w06/zYL6FIG8 D9hStzPy2ggE29+g/O7L3WZen62bcUd0RaLDSd40pcckonraJYTFpkhn1LqnlrPkPW7SQEC Gkr0yE6kceCZYemD8dzSA== X-UI-Out-Filterresults: notjunk:1; V01:K0:paPQYMkV5Qk=:o4nq+GYHkJv8rf7HmXCwkd Km4ogbJyBZlsMKn96VpxDCWO3UuCnITtnAq1p1DReAa7moeG2aLfqFzZ0EZ/fsj0USIIaTooa dNR0VZdA6EfP/b1lneoFOHp5cpBINuT/Nq9KXl0DLQBBEySLmACfi6+Fj1bL2rndcO61ZZeCJ +v0yS5m0J7FB+MDvel+FUzpOx7FIq/DqUGbJj/fq62RgY+wWbUsImfgxborrwbmgHLlGlLFEh hgWQbO3kclJrcN5vpe75NncBq1rjLy1eSc4FMKlSP0Qtk+ur3J9pGuGM2tLVjARPulyBndRnt hRPVxu4YOh283uTzY7kwiCHQNK6k1i2AtG3E8ZLAX/Z+HU4gdbgnJSJXnGPTseFxGOeaAa/RJ L1UV6n0Pr1yKVREySl18FLkVb9lkGmn6fmCZJ2Hu3VFigWTDmcAi0W3LRa15ysRlreAsZHTsH wYusZkFDT99OWZY9pouB1HrA+8+Q2xUExQea6uoWkk6vJZqQ9RW4+bbGRaxfZxhJvqlg9/v/0 5/hKdvyNEyp1ZQ5zRzQi1akM4yiWSC+2OeHwMFsKxuOYluo5/Lk8jrr/Bd5/tqeOngCbOHS/B FjunHKU6z25kcPZZ/5kl3l4wcVOo2Fnd9my0OYKuiAflf7sBssGO1r4xX+zrnlbpugdCf6K4M UM6c0F1Mxyx4dmO3x9wJ8UnJksznUtsGbTpsKOT5xULDW07k7gQ1+nqiqzUawueh9r7zTMslu DYLKv3D9dRlFvNKUsWqsGNTnjXpRHhZNUus58Q== X-CLX-Shades: MLX X-CLX-Response: 1TFkXGBIZEQpMehccGhEKWU0XZ2ZyEQpZSRcacRoQGncGGBwZcR4YEhAadwY YGgYaEQpZXhdobnkRCklGF0VYS0lGT3VaWEVOX0leQ0VEGXVPSxEKQ04XfGBQaEB/SXhiR25nYm F9XHNAfl5uaEcTRXNaQW9MTlwRClhcFx8EGgQbGBgHHEtIS08eHBoFGxoEGxoaBB4SBB8QGx4aH xoRCl5ZF3hNe39JEQpNXBccGxMRCkxaF2loaUJNXREKTU4XaBEKQ1oXGBsYBBgYHQQbGBwEGxka EQpCXhcbEQpEXhcZEQpESRcSEQpCRhdnE21gG1tlQh9+fREKQlwXGhEKQkUXY1kSTkxpc1l5RFg RCkJOF2UTcG1HS0RtXRNlEQpCTBdseRhzQEcSWGASQhEKQmwXZBhEenxue3N5EmERCkJAF25lXm kecxNsZ11OEQpCWBdifW95AU8YGXBwexEKWlgXGxEKcGgXZEEFeH5EWVNzHl8QGhEKcGgXYn1JY HJsZhl5bkkQGhEKcGgXZ3hpRX5LU0BCBXsQGhEKcGgXYFhlTXp9ZlBPZW8QGhEKcGgXekZIYUtA QxocQFAQGhEKcGwXZ2AfX0h8T19tewUQGRoRCnBDF2UbXBpsE2BaQxpSEBkaEQptfhcaEQpYTRd LESA= X-PDR: PASS X-Source-IP: 212.227.126.130 X-ServerName: mout.kundenserver.de X-Proofpoint-SPF-Result: None X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8761 signatures=668650 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=60 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=283 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=880 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1801020155 X-Spam: Clean Cc: Stephen Rothwell , Arnd Bergmann , linux-kernel@vger.kernel.org, Fabian Frederick , ocfs2-devel@oss.oracle.com Subject: [Ocfs2-devel] [PATCH] ocfs: fix fall-back-to-buffer-io-when-append-dio-is-disabled-with-file-hole-existing-fix X-BeenThere: ocfs2-devel@oss.oracle.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ocfs2-devel-bounces@oss.oracle.com Errors-To: ocfs2-devel-bounces@oss.oracle.com X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8761 signatures=668650 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1801020155 X-Virus-Scanned: ClamAV using ClamSMTP The 'ret' variable is used to store the integer return value of ocfs2_get_clusters(), as shown by this warning from modern compilers: fs/ocfs2/aops.c: In function 'ocfs2_range_has_holes': fs/ocfs2/aops.c:2437:11: error: comparison of constant '0' with boolean expression is always false [-Werror=bool-compare] Fixes: mmotm ("ocfs2-fall-back-to-buffer-io-when-append-dio-is-disabled-with-file-hole-existing-fix") Signed-off-by: Arnd Bergmann --- fs/ocfs2/aops.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c index 87562112cb5e..8aa2519a0966 100644 --- a/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c @@ -2432,10 +2432,11 @@ static bool ocfs2_range_has_holes(struct inode *inode, loff_t pos, size_t count) clusters = ocfs2_clusters_for_bytes(sb, pos + count) - cpos; while (clusters) { - ret = ocfs2_get_clusters(inode, cpos, &phys_cpos, &extent_len, - &extent_flags); - if (ret < 0) { - mlog_errno(ret); + int err = ocfs2_get_clusters(inode, cpos, &phys_cpos, + &extent_len, &extent_flags); + if (err < 0) { + mlog_errno(err); + ret = true; goto out; }