| From c7c2750f54b9f94a5ee8d18794c5d3a9c26209ea Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 22 Mar 2019 15:19:16 +0100 |
| Subject: jfs: fix bogus variable self-initialization |
| |
| From: Arnd Bergmann <arnd@arndb.de> |
| |
| [ Upstream commit a5fdd713d256887b5f012608701149fa939e5645 ] |
| |
| A statement was originally added in 2006 to shut up a gcc warning, |
| now but now clang warns about it: |
| |
| fs/jfs/jfs_txnmgr.c:1932:15: error: variable 'pxd' is uninitialized when used within its own initialization |
| [-Werror,-Wuninitialized] |
| pxd_t pxd = pxd; /* truncated extent of xad */ |
| ~~~ ^~~ |
| |
| Modern versions of gcc are fine without the silly assignment, so just |
| drop it. Tested with gcc-4.6 (released 2011), 4.7, 4.8, and 4.9. |
| |
| Fixes: c9e3ad6021e5 ("JFS: Get rid of "may be used uninitialized" warnings") |
| Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
| Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| fs/jfs/jfs_txnmgr.c | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c |
| index 4d973524c8879..224ef034004b7 100644 |
| --- a/fs/jfs/jfs_txnmgr.c |
| +++ b/fs/jfs/jfs_txnmgr.c |
| @@ -1928,8 +1928,7 @@ static void xtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd, |
| * header ? |
| */ |
| if (tlck->type & tlckTRUNCATE) { |
| - /* This odd declaration suppresses a bogus gcc warning */ |
| - pxd_t pxd = pxd; /* truncated extent of xad */ |
| + pxd_t pxd; /* truncated extent of xad */ |
| int twm; |
| |
| /* |
| -- |
| 2.20.1 |
| |