From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757455AbcAYPeQ (ORCPT ); Mon, 25 Jan 2016 10:34:16 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:59321 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751758AbcAYPeP (ORCPT ); Mon, 25 Jan 2016 10:34:15 -0500 From: Arnd Bergmann To: Steven Whitehouse , Bob Peterson Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , cluster-devel@redhat.com, linux-kernel@vger.kernel.org Subject: [PATCH] gfs2: avoid uninitialized variable warning Date: Mon, 25 Jan 2016 16:32:45 +0100 Message-Id: <1453735996-1958733-2-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1453735996-1958733-1-git-send-email-arnd@arndb.de> References: <1453735996-1958733-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:HORaNShL7jODk2iZjMZvPVUbYiCwNHK7nsEsSPkAvLKdpAMCY86 NOE2y4tnrLldW6BzLcnFPKktENMB9iJFpUB9/I4qy51jPpVUSubNcowDmPRRvY3fuGiO3w6 XA/rOVxRd6XZ8YuhlpFLWDss9stR6IHCRAJ9N8zLvfFq1wQRWvrEvsS+L1EF43V6awcKrtz 8+NB/CUg5Gy/2Jo5gUIWw== X-UI-Out-Filterresults: notjunk:1;V01:K0:scBya7jFPgQ=:z21k9pnzo7OdtiwaoBxbZq 4VSbnxQzfK85iN5CFcVfOCGM6lz1T1JhXUi3Q4QY8kcJ2M1WPInfAPATgflwIouUs5K2Xol7T Nq+um1pa8wr0UUcn43SDHG++et3hXHgb533PNSv/6YxI+rXTw27NaKADQ2hjQHV7vjKN9IZYr +JOhYM5yGUh3Xun/RV2JsPydBWIzLwZEy+O8aQlXGGtZikt7w00UmYfoXt4nM3qAMATyQjhpx K2VhcspJ0IxB2b6iDmCjMhhzSyILHVcojNcHu+D2VDU7wA5QnHzqDQ8uimWqzamkFuhvIt/ks +S/rIDuCRYthNGhFUdys6JiuQMTOrMWz/ATaTwsr72EDu93OjvHyJ1+innkDxFivUxD/qMBL2 dNdr3LOcOu0fdFGKCigKpeB2zkIJRMQOI7tp8RAQiOfICAM1zyf92mU9QWRqmRQL3ptYHsk58 9y1/LY4kKTSrvSK6vgkOWO1Z0uA9D/+BcpILGuxP4IB5yjMqhw1sbrRkk0srk60OtdegiSblf 5YZ9bu8YLOirygwd9Vqnr0LNwoqEt7GBVDdxxL2dj/ogUO173SYVzPubsiNZ1zwcRwDWRIFx/ uJ2vMnRkv99SIYO52tzRUjjLWsVWL8Dj5irPzcwJwm27+isrGiMTUG5mC4uoKSI+mn+I3q4jn bkxOvPoEU2ERdcLQz0FhnEXlF1+urX/JE/8AQx6flDxDRB0gOED55PSl0T7e2MaYQu2k= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We get a bogus warning about a potential uninitialized variable use in gfs2, because the compiler does not figure out that we never use the leaf number if get_leaf_nr() returns an error: fs/gfs2/dir.c: In function 'get_first_leaf': fs/gfs2/dir.c:802:9: warning: 'leaf_no' may be used uninitialized in this function [-Wmaybe-uninitialized] fs/gfs2/dir.c: In function 'dir_split_leaf': fs/gfs2/dir.c:1021:8: warning: 'leaf_no' may be used uninitialized in this function [-Wmaybe-uninitialized] Changing the 'if (!error)' to 'if (!IS_ERR_VALUE(error))' is sufficient to let gcc understand that this is exactly the same condition as in IS_ERR() so it can optimize the code path enough to understand it. Signed-off-by: Arnd Bergmann --- fs/gfs2/dir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c index 6a92592304fb..d4014af4f064 100644 --- a/fs/gfs2/dir.c +++ b/fs/gfs2/dir.c @@ -798,7 +798,7 @@ static int get_first_leaf(struct gfs2_inode *dip, u32 index, int error; error = get_leaf_nr(dip, index, &leaf_no); - if (!error) + if (!IS_ERR_VALUE(error)) error = get_leaf(dip, leaf_no, bh_out); return error; @@ -1014,7 +1014,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 (error) + if (IS_ERR_VALUE(error)) return error; /* Get the old leaf block */ -- 2.7.0