From patchwork Tue May 9 10:04:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98894 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp1739417qge; Tue, 9 May 2017 03:05:18 -0700 (PDT) X-Received: by 10.84.238.199 with SMTP id l7mr62331487pln.153.1494324318739; Tue, 09 May 2017 03:05:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494324318; cv=none; d=google.com; s=arc-20160816; b=0Y54Dlx+8mgA1CX0pWIFzgIaXaQXa1X/CoQQzsyr16w6Tv1X8cdhptRdeOVsEolP/p ZUTBdj055/OHE90RN6Z1Fj7wmo48DBXKniH35cICMQsIwT/YQlkLwdywW29st4zf4V+K zWtya3akw/Q7a07WJDfU5I7Xh9WaqDWO75ERxk5lj1nGBis3DvslFBk8mAQZFSeMTcaV op9CQ3l6gGMAo2dYeqbweZ19YANRDE3IMR527ECYd3AKyjZpQYIlixdJH8+wiMwfW2CE FItp3kmK6KU+VxMYdc0sZ9DFf/W8kzeH0FdjSrLKT17LKkzREe4yyKgNqw289tri0Jva 2qcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=uX4nhASCdDFUd54Jt78z/Q72fGUoMhaxGSYoCFXDQGs=; b=AUr1hFUcHRCR5FARJ0FRFOgdfLoF6OJyhPTpMMD/lqgQg/HLGh0rViCQ7LjT9VealE YTXwPOzrY+TPYkO+1Cz2/gkXFJ4Cr0qKtcxy6cV16IKNBK1/aUso6NnL70hcTtc3dwR2 vGPH/WE4/MPIekhju5Gc/Vtdu0OuXaKEyufQxuxqB+S817paXnFCD5SY9tPfetPDgrKL xRBUOWpxSoqTVUuqsExo+yRd3szRuv/0Qmm7rhXZUAJB8Q6Yi4BcN6fC13wRSGsWMDEt CV+NXTET0PDDTtEHL/+rLuZyT9Uthire0yN6oirBkvxw1dW+wChpszzmQ7Jvpet3ttzs Yr0g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h13si12805392pgn.51.2017.05.09.03.05.18; Tue, 09 May 2017 03:05:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751295AbdEIKFR (ORCPT + 6 others); Tue, 9 May 2017 06:05:17 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:52733 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751343AbdEIKFQ (ORCPT ); Tue, 9 May 2017 06:05:16 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.129]) with ESMTPA (Nemesis) id 0LbvAu-1dr1Q53Mgu-00jKmi; Tue, 09 May 2017 12:05:13 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann Subject: [PATCH 3.16-stable 08/14] gfs2: remove IS_ERR_VALUE abuse Date: Tue, 9 May 2017 12:04:56 +0200 Message-Id: <20170509100502.1358298-9-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170509100502.1358298-1-arnd@arndb.de> References: <20170509100502.1358298-1-arnd@arndb.de> X-Provags-ID: V03:K0:rMUAcIteSu+Pn8s/jMy++A0uIaMBnzRNPow1NXxbti2gG8TnxCS YOoaB2BQGRr6FqgSMju2NvtactvGMPwTfT01il/DXL0V3I7ANLK8BfdrkC/27M863W+9jDN ZtOme+f8zqkWVKDusDce62TE0uE7rok5Rc91i0a6U+D64wJgMuJ9U3vi4BwZZoyuqOYCH5x q9syIK/VU4/BJDl2dXWcA== X-UI-Out-Filterresults: notjunk:1; V01:K0:q0dSqlm00G0=:bm3fr7iuVxhrluhaRubTKh lOmw6SXethq1mgf96+i9gO77FjH8LBxAPOlCxg7mXlAOnY/0nlhHpCBwi0Px6xkN/iBFA+v/B DDssrvYs5WOZgH+e9i5/zYfwL4b9ClRchNRXFtzZquRusx4/53OiUdskbRszI0CgQSm8k5avN z/lAsCQZ+cnbKEWOxRnNnc8tiHJVo5p2Dlx/IFDV7ZK7Q2Kjvk2f30TNPmZrsIUj46Yj9oH0t dEfphs6dI5i+Q6zgaGdbve1EClwSSPHvo9k+EiBQb6QFsECThSKRApGJWk86AYQkFFT6c03jH FmbY6yzEhCdUkpsD/4U/4kzer6HaCFkQpDLkWvz7jQiCur+uZqzPXZlZrep+iTdwDM8bIQBY6 8xm6KTES2Xr5aKNqu6gGQ2bIAC809UcaXQDhY5dZl2QLbf9G2WWcWDzVwmV4f7xnAsM5z8B93 p+OuEnbJ6OswWcS6soeclSww706a4xkzPeHb3UnTTAo9IXjXCnzWWtqDRFbVd5KiL4L94bRut 9B2NOIcZsBMdc4RxK3dmnManWPLXEmrX0Hm9tZIGB/RWLHX+VtTYIbhbWIkdq28KigT3JvubY 8Ar1DamSLbNE8DPgk29VBGg6WxZcFcsVnmOFCgbmeCLkmUZblLBRrJBb5qaPxDdvhqcKgK8LT BJModsXR2kyjz2Vo8cv+iW/SE9Qmf3V2XYXLpq+GMTG4tznmPAc5i31z+BiZCBhSr3/U= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Picked from commit 287980e49ffc0f6d911601e7e352a812ed27768e ("remove lots of IS_ERR_VALUE abuses") upstream. The original fix that was backported to 3.18 already addressed the warning in some configurations, but not in others, leaving us with the same output: ../fs/gfs2/dir.c: In function 'get_first_leaf': ../fs/gfs2/dir.c:768:9: warning: 'leaf_no' may be used uninitialized in this function [-Wmaybe-uninitialized] error = get_leaf(dip, leaf_no, bh_out); ^ ../fs/gfs2/dir.c: In function 'dir_split_leaf.isra.20': ../fs/gfs2/dir.c:987:8: warning: 'leaf_no' may be used uninitialized in this function [-Wmaybe-uninitialized] This takes the approach that we took in later versions in mainline, but does not backport the entire patch, as that would be too large for stable and IIRC caused regressions in other drivers. Fixes: 9d46d31e9aea ("gfs2: avoid uninitialized variable warning") Signed-off-by: Arnd Bergmann --- fs/gfs2/dir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.0 diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c index 6810c8772eb1..f3508f4583d5 100644 --- a/fs/gfs2/dir.c +++ b/fs/gfs2/dir.c @@ -767,7 +767,7 @@ static int get_first_leaf(struct gfs2_inode *dip, u32 index, int error; error = get_leaf_nr(dip, index, &leaf_no); - if (!IS_ERR_VALUE(error)) + if (!error) error = get_leaf(dip, leaf_no, bh_out); return error; @@ -983,7 +983,7 @@ static int dir_split_leaf(struct inode *inode, const struct qstr *name) index = name->hash >> (32 - dip->i_depth); error = get_leaf_nr(dip, index, &leaf_no); - if (IS_ERR_VALUE(error)) + if (error) return error; /* Get the old leaf block */