hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

jfs: turn diLog(), dataLog() and txLog() into void functions 

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>
This commit is contained in:
Yang Li 2021-02-07 16:32:50 +08:00 committed by Dave Kleikamp
parent 3bef198f1b
commit 093e0687c5
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
fs/jfs/jfs_txnmgr.c
View File

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