Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Dave Kleikamp <dave.kleikamp@oracle.com>
To:     Yang Li <yang.lee@linux.alibaba.com>
Cc:     jfs-discussion@lists.sourceforge.net, linux-kernel@vger.kernel.org
Subject: [PATCH v3] jfs: turn diLog(), dataLog() and txLog() into void functions
Date:   Mon,  8 Feb 2021 09:23:54 -0600
Message-Id: <20210208152354.880319-1-dave.kleikamp@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from shaggy-t450.localdomain (68.201.65.98) by SA0PR13CA0027.namprd13.prod.outlook.com (2603:10b6:806:130::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.11 via Frontend Transport; Mon, 8 Feb 2021 15:24:01 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: d8ea4b79-d101-42ea-fb9f-08d8cc459013
X-MS-TrafficTypeDiagnostic: CH2PR10MB4005:
X-Microsoft-Antispam-PRVS: <CH2PR10MB40057D26B300B955BFB5E023878F9@CH2PR10MB4005.namprd10.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:923;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: Hg60qxJLxsKjGPC7W94Yc5xCDiTHLHD0QWvDWIeMDJADdzQdfV4Wut7en1z55X4gC+kYuQwpaIggcyTWpnxDy5rm/NYaoMp/ALrQRtdBFMZfrn8Y7tHz7nn3w3F/noyhhfHDEQgkWfqIfA7j+1TY8zHf4fue+gR/sKBMDEXBA92G4SzMjyW7kCuzz2oj0ygqsQxc6aGad4eoVUdLiR7OOeszj+00MyPegZtluafrV+uVc7fEZzVjMe4PYa6IdDxLyU3MpXU6SZrwwEeKMOSrByFaZssedyp/B2dvBBqUqmOyZqde4CTdfWQk/vVpiqtyc9ZEjfRrEeg8V+TFSTMIFT6REo/6fLY+ryY9KZbl08QvwcQsbiRg6fZrtjIZvIdGXuzG8UC5P9u4+yduXEQ40PAUfffA4nPvVC6PGwmdAT7jjGIU19YQVi4mHn9io1xRfFEwTjghwBeEIplrkUOuXXY4nnvi4Io0bk4uO1lgOPtwjAKrlQ2Gd91dYHEjNK/MdRlqj3QjbXIzGP/ZkwBXgg==
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH2PR10MB4118.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(376002)(39860400002)(346002)(396003)(366004)(136003)(8936002)(52116002)(66556008)(66476007)(6666004)(6512007)(66946007)(4326008)(2616005)(86362001)(5660300002)(83380400001)(6506007)(1076003)(44832011)(16526019)(2906002)(186003)(26005)(956004)(6486002)(36756003)(478600001)(6916009)(8676002)(316002);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?FEl3IhN9yQX00cJSpR4m8WEOdeSoxdX1WSy767djiRhh0dCrpsqjtCpuT7Df?=
 =?us-ascii?Q?PzQYPOrmL1yE2wgdNapNt/gH9kHdNrv8RCAVv8eRUh9psUycTxNg5oOYOH/8?=
 =?us-ascii?Q?RyWYMPqxXwiZtpapPt0bEM2Esd7zQVs+YBuM2wKwiFNRRrRBcZJBz266dbS/?=
 =?us-ascii?Q?qkyiSpejkvqf+nnr9G7qipPe0yF5UmITphcBlkF1zICeEH5cuID+VB6jtInE?=
 =?us-ascii?Q?4vPAzICDB7CUGXFC/BCbDzKGbR6M7BmE3qg61CuyA8KeU6bXYiCdaQfVibeQ?=
 =?us-ascii?Q?rYLWDG0kMytybwU/cIPLFdk/aotaUkJcguCjAiX/Uf+N9iCOCcbmb4JDsXu9?=
 =?us-ascii?Q?XHWVrRawVEAdUDRZg5dy2wUxWhDKRVUEtD0OokC5Q6PNbvYorgLpHZUWYbjz?=
 =?us-ascii?Q?i48M3q83moNhIA9p1aoIgyEc0BXcOWoSnOgKFPR/MaA7AnU+HudXIRIi7+Z+?=
 =?us-ascii?Q?gB3HqjPSGJblGo2l0Eis56CBLgCfG3+ezOgE8j/7J6Ct9pB4azsnCbb07xVt?=
 =?us-ascii?Q?vi0+VbGiouaVwauqQzx7USomiUaP9mlZrjK6ABY4dDIPXnAE6JeVdzzVM8WL?=
 =?us-ascii?Q?hAEy0xPqAbM917oS7RpoOfzh9ErTYuBZVOBl+b83j7QHpUAkcyjrI4IS/+tw?=
 =?us-ascii?Q?lfpBUsWGteQHy5pc3H/Cs+JWCurY+fbOsvx9EIf5QGC5bxJ8N6x1HwCPOpoU?=
 =?us-ascii?Q?NDmfW23+co+SlkAhfagJLr4r/fS3nfdkUgrGTDbCaWZNYDJSEvIvvHDHUftZ?=
 =?us-ascii?Q?MxS9r1SECiS2FPmmrDSV64NdJNcr4cfJfk+i+qkR0jqwpeTZ/IoBUV2r0YPv?=
 =?us-ascii?Q?wtunD3KqcBLVasE4RY16MtmEK5nUF6EtEueV0oKTxzwfk8JC8bD+iUpoxGed?=
 =?us-ascii?Q?EAXLZjf/ibxc2X0rdODwce2VXR7Ln+BbvfNqmqGwvAecyMSpKhxx7tWlCgOM?=
 =?us-ascii?Q?NFqJdz6q44NGM2PE6r6qFFxqBactQDCjMyhQDq/aCgQM3S7MQ7mBL7ATUDEI?=
 =?us-ascii?Q?sSlXSNwOZXeGD71Tqwp7S2hWpdkFCnhbAN+Chtm/sQCNCu3dBg3iFHDzijGu?=
 =?us-ascii?Q?s6RnHfiwZ07aPDqU8VjB4jr61nVt/XNB4nDGhKb7Lgem4MFTvketktCBAAg3?=
 =?us-ascii?Q?vdOS5OqzAa8DZQfs9f0W6hsOWL4uKfHl/sDdqy8UZ33bZaDdbNKec2733E/p?=
 =?us-ascii?Q?Rrt6coYvmzPN4un/bz8G8AcNy/rpgUEctvEZ870GmiUiisC3QLM1/T9fLRz4?=
 =?us-ascii?Q?lu/Di+oiE592UK1PGYD64ewXlw+PgrkftKzaPd4Q5ioUQGAfsD8tAniFpVxl?=
 =?us-ascii?Q?bSQCrIWJCUyUne64K+4ZR/Gk?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d8ea4b79-d101-42ea-fb9f-08d8cc459013
X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4118.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2021 15:24:01.6735
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 5AhFfzGHHCfQxiQH0O5FKdNHxv8ltuTwwohS18kbNZPHaM6Tp8+Z8Qs6A4wHsRZ6WjSjwYBbQhmThGvONnxUmoG0XumZPpGcbOYm9p0kEt0=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR10MB4005
X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9888 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 adultscore=0
 mlxlogscore=941 malwarescore=0 bulkscore=0 phishscore=0 spamscore=0
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2009150000 definitions=main-2102080104
X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9888 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0
 spamscore=0 lowpriorityscore=0 phishscore=0 adultscore=0 impostorscore=0
 suspectscore=0 mlxscore=0 clxscore=1015 mlxlogscore=999 bulkscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000
 definitions=main-2102080104
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Yang Li <yang.lee@linux.alibaba.com>

These functions always return '0' and no callers use the return value.
So make it a void function.

This eliminates the following coccicheck warning:
./fs/jfs/jfs_txnmgr.c:1365:5-7: Unneeded variable: "rc". Return "0" on
line 1414
./fs/jfs/jfs_txnmgr.c:1422:5-7: Unneeded variable: "rc". Return "0" on
line 1527

Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>
Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
---

Changes in v3
- don't check return value of txLog() in txCommit() (Dave Kleikamp)

Changes in v2
-turn functions forward references to void type.

 fs/jfs/jfs_txnmgr.c | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c
index dca8edd2378c..053295cd7bc6 100644
--- a/fs/jfs/jfs_txnmgr.c
+++ b/fs/jfs/jfs_txnmgr.c
@@ -148,10 +148,10 @@ static struct {
 /*
  * forward references
  */
-static int diLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
-		struct tlock * tlck, struct commit * cd);
-static int dataLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
-		struct tlock * tlck);
+static void diLog(struct jfs_log *log, struct tblock *tblk, struct lrd *lrd,
+		struct tlock *tlck, struct commit *cd);
+static void dataLog(struct jfs_log *log, struct tblock *tblk, struct lrd *lrd,
+		struct tlock *tlck);
 static void dtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
 		struct tlock * tlck);
 static void mapLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
@@ -159,8 +159,8 @@ static void mapLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
 static void txAllocPMap(struct inode *ip, struct maplock * maplock,
 		struct tblock * tblk);
 static void txForce(struct tblock * tblk);
-static int txLog(struct jfs_log * log, struct tblock * tblk,
-		struct commit * cd);
+static void txLog(struct jfs_log *log, struct tblock *tblk,
+		struct commit *cd);
 static void txUpdateMap(struct tblock * tblk);
 static void txRelease(struct tblock * tblk);
 static void xtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
@@ -1256,8 +1256,7 @@ int txCommit(tid_t tid,		/* transaction identifier */
 	 *
 	 * txUpdateMap() resets XAD_NEW in XAD.
 	 */
-	if ((rc = txLog(log, tblk, &cd)))
-		goto TheEnd;
+	txLog(log, tblk, &cd);
 
 	/*
 	 * Ensure that inode isn't reused before
@@ -1365,9 +1364,8 @@ int txCommit(tid_t tid,		/* transaction identifier */
  *
  * RETURN :
  */
-static int txLog(struct jfs_log * log, struct tblock * tblk, struct commit * cd)
+static void txLog(struct jfs_log *log, struct tblock *tblk, struct commit *cd)
 {
-	int rc = 0;
 	struct inode *ip;
 	lid_t lid;
 	struct tlock *tlck;
@@ -1414,7 +1412,7 @@ static int txLog(struct jfs_log * log, struct tblock * tblk, struct commit * cd)
 		}
 	}
 
-	return rc;
+	return;
 }
 
 /*
@@ -1422,10 +1420,9 @@ static int txLog(struct jfs_log * log, struct tblock * tblk, struct commit * cd)
  *
  * function:	log inode tlock and format maplock to update bmap;
  */
-static int diLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
-		 struct tlock * tlck, struct commit * cd)
+static void diLog(struct jfs_log *log, struct tblock *tblk, struct lrd *lrd,
+		 struct tlock *tlck, struct commit *cd)
 {
-	int rc = 0;
 	struct metapage *mp;
 	pxd_t *pxd;
 	struct pxd_lock *pxdlock;
@@ -1527,7 +1524,7 @@ static int diLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
 	}
 #endif				/* _JFS_WIP */
 
-	return rc;
+	return;
 }
 
 /*
@@ -1535,8 +1532,8 @@ static int diLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
  *
  * function:	log data tlock
  */
-static int dataLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
-	    struct tlock * tlck)
+static void dataLog(struct jfs_log *log, struct tblock *tblk, struct lrd *lrd,
+	    struct tlock *tlck)
 {
 	struct metapage *mp;
 	pxd_t *pxd;
@@ -1562,7 +1559,7 @@ static int dataLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
 		metapage_homeok(mp);
 		discard_metapage(mp);
 		tlck->mp = NULL;
-		return 0;
+		return;
 	}
 
 	PXDaddress(pxd, mp->index);
@@ -1573,7 +1570,7 @@ static int dataLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
 	/* mark page as homeward bound */
 	tlck->flag |= tlckWRITEPAGE;
 
-	return 0;
+	return;
 }
 
 /*
-- 
2.30.0