From patchwork Tue Feb 14 17:08:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9572379 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 5B6C960573 for ; Tue, 14 Feb 2017 17:09:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 34D9728408 for ; Tue, 14 Feb 2017 17:09:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 295562843E; Tue, 14 Feb 2017 17:09:11 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A42F328408 for ; Tue, 14 Feb 2017 17:09:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755040AbdBNRJD (ORCPT ); Tue, 14 Feb 2017 12:09:03 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:55281 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754030AbdBNRI4 (ORCPT ); Tue, 14 Feb 2017 12:08:56 -0500 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.129]) with ESMTPA (Nemesis) id 0MC5LA-1cUqu82SeG-008tWH; Tue, 14 Feb 2017 18:08:40 +0100 From: Arnd Bergmann To: "Darrick J. Wong" , linux-xfs@vger.kernel.org Cc: Christoph Hellwig , Arnd Bergmann , Dave Chinner , Brian Foster , linux-kernel@vger.kernel.org Subject: [PATCH] xfs: fix len comparison in xfs_extent_busy_trim Date: Tue, 14 Feb 2017 18:08:30 +0100 Message-Id: <20170214170836.2705798-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:DtlcRkM+Q61CT2XOrBey0DUCg13upgkOB8yuKkrmggJ/vcwUraU nbg41vzSHUIWIMhIyDmwnhhiVdFbsfzBUO5qxZ4B5uPwz/7X5KCjpBRHx4OGHmKnqjQzbwC 36MkKhbkKVMZYvl/R6ZMUn2aWz8ApZc6ts8MzuzL4q3ob9ucmJ/HqdIDgdFH6xqvnSdk5cD kFv2iO7AmeShBbEB3obWw== X-UI-Out-Filterresults: notjunk:1; V01:K0:mKaY15BpdGY=:TJOmw9tev+FL65wA11yTG3 McT9UkGzseRjoo/ORFm1sVgwFRBkuzJjXtAZML0dcItKb6uU6IxO5KWHDx01I6ghFAfcuMTop a3Egk7Fa/CQumXwfIWVyxjEvMF/dnaMC6PtDhk0NkDv0wWNBl4sLAHKeCAbpdeerd2W1Cie+2 eaw/O8V7OY3wjF1x/qZ8FeVK0SrE0mYGeF65JJM+m/r93rv4Zrnn/4qmT4AureBithYURRX1G JJ6qMZ2NYQNkOw0GaShPFc+e15g0/15666b5KP+uq4dGxHanQKapRYKOWaB8mW0H/IgcAzw05 rdZkkbqXQ9+9+q/pyAfSJ5RCGoTeRCFfh+VJ1m/qos0n99qvrKsDAoVJiNtLeqA6ejIbOSLHz h+cjjlFCCd8Xea+QyYxEFGjj1pZEKzJgh04I6C6PQZ7U/n9Xar3XjOSE8R4eg1BsdX+u7XffW M54gdEIDdoaBEfGilexVdNVh16sxHvZre2Zg+QkYljPjRtrxIlp3uo862hFGabJiXCGn74hZp Kcm1nrHDBQJNJPLTv9+4tjSLHgfeq55lTFbTpRqyiG76EpwYaUXdJdkNFqEUa/o3NhMZTwFfS E9YxrhUzfnuaT2IUIw48wH09OPpAGREECOENT5/fq72VNjh6yVGlNDJvoaNNGLKvjTbihvNpt /esaF5142MdsWm8NPABAfrz7BUl1ts/3vL4bZBrixObDAJ7eHPW1/OOBRnAur1XCzaPg= Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The length is now passed by reference, so the assertion has to be updated to match the other changes, as pointed out by this W=1 warning: fs/xfs/xfs_extent_busy.c: In function 'xfs_extent_busy_trim': fs/xfs/xfs_extent_busy.c:356:13: error: ordered comparison of pointer with integer zero [-Werror=extra] Fixes: ebf55872616c ("xfs: improve handling of busy extents in the low-level allocator") Signed-off-by: Arnd Bergmann Reviewed-by: Christoph Hellwig --- fs/xfs/xfs_extent_busy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/xfs/xfs_extent_busy.c b/fs/xfs/xfs_extent_busy.c index ab062610234e..77760dbf0242 100644 --- a/fs/xfs/xfs_extent_busy.c +++ b/fs/xfs/xfs_extent_busy.c @@ -353,7 +353,7 @@ xfs_extent_busy_trim( struct rb_node *rbp; bool ret = false; - ASSERT(len > 0); + ASSERT(*len > 0); spin_lock(&args->pag->pagb_lock); restart: