leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gfs2: Turn gfs2_consist into void functions

Browse Source 
Change the various gfs2_consist functions to return void.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
This commit is contained in:
Andreas Gruenbacher 2020-01-23 19:31:06 +01:00 committed by Bob Peterson
parent d7e7ab3f1e
commit a5ca2f1cb6
2 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fs/gfs2/util.c
View File

@ -138,27 +138,23 @@ int gfs2_assert_warn_i(struct gfs2_sbd *sdp, char *assertion,
/** /**
* gfs2_consist_i - Flag a filesystem consistency error and withdraw * gfs2_consist_i - Flag a filesystem consistency error and withdraw
* Returns: -1 if this call withdrew the machine,
* 0 if it was already withdrawn
*/ */
int gfs2_consist_i(struct gfs2_sbd *sdp, const char *function, void gfs2_consist_i(struct gfs2_sbd *sdp, const char *function,
char *file, unsigned int line) char *file, unsigned int line)
{ {
gfs2_lm(sdp, gfs2_lm(sdp,
"fatal: filesystem consistency error - function = %s, file = %s, line = %u\n", "fatal: filesystem consistency error - function = %s, file = %s, line = %u\n",
function, file, line); function, file, line);
return gfs2_withdraw(sdp); gfs2_withdraw(sdp);
} }
/** /**
* gfs2_consist_inode_i - Flag an inode consistency error and withdraw * gfs2_consist_inode_i - Flag an inode consistency error and withdraw
* Returns: -1 if this call withdrew the machine,
* 0 if it was already withdrawn
*/ */
int gfs2_consist_inode_i(struct gfs2_inode *ip, void gfs2_consist_inode_i(struct gfs2_inode *ip,
const char *function, char *file, unsigned int line) const char *function, char *file, unsigned int line)
{ {
struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode); struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);
@ -169,17 +165,15 @@ int gfs2_consist_inode_i(struct gfs2_inode *ip,
(unsigned long long)ip->i_no_formal_ino, (unsigned long long)ip->i_no_formal_ino,
(unsigned long long)ip->i_no_addr, (unsigned long long)ip->i_no_addr,
function, file, line); function, file, line);
return gfs2_withdraw(sdp); gfs2_withdraw(sdp);
} }
/** /**
* gfs2_consist_rgrpd_i - Flag a RG consistency error and withdraw * gfs2_consist_rgrpd_i - Flag a RG consistency error and withdraw
* Returns: -1 if this call withdrew the machine,
* 0 if it was already withdrawn
*/ */
int gfs2_consist_rgrpd_i(struct gfs2_rgrpd *rgd, void gfs2_consist_rgrpd_i(struct gfs2_rgrpd *rgd,
const char *function, char *file, unsigned int line) const char *function, char *file, unsigned int line)
{ {
struct gfs2_sbd *sdp = rgd->rd_sbd; struct gfs2_sbd *sdp = rgd->rd_sbd;
char fs_id_buf[sizeof(sdp->sd_fsname) + 7]; char fs_id_buf[sizeof(sdp->sd_fsname) + 7];
@ -192,7 +186,7 @@ int gfs2_consist_rgrpd_i(struct gfs2_rgrpd *rgd,
" function = %s, file = %s, line = %u\n", " function = %s, file = %s, line = %u\n",
(unsigned long long)rgd->rd_addr, (unsigned long long)rgd->rd_addr,
function, file, line); function, file, line);
return gfs2_withdraw(sdp); gfs2_withdraw(sdp);
} }
/** /**

12
fs/gfs2/util.h
View File

@ -52,22 +52,22 @@ int gfs2_assert_warn_i(struct gfs2_sbd *sdp, char *assertion,
__func__, __FILE__, __LINE__)) __func__, __FILE__, __LINE__))
int gfs2_consist_i(struct gfs2_sbd *sdp, void gfs2_consist_i(struct gfs2_sbd *sdp,
const char *function, char *file, unsigned int line); const char *function, char *file, unsigned int line);
#define gfs2_consist(sdp) \ #define gfs2_consist(sdp) \
gfs2_consist_i((sdp), __func__, __FILE__, __LINE__) gfs2_consist_i((sdp), __func__, __FILE__, __LINE__)
int gfs2_consist_inode_i(struct gfs2_inode *ip, void gfs2_consist_inode_i(struct gfs2_inode *ip,
const char *function, char *file, unsigned int line); const char *function, char *file, unsigned int line);
#define gfs2_consist_inode(ip) \ #define gfs2_consist_inode(ip) \
gfs2_consist_inode_i((ip), __func__, __FILE__, __LINE__) gfs2_consist_inode_i((ip), __func__, __FILE__, __LINE__)
int gfs2_consist_rgrpd_i(struct gfs2_rgrpd *rgd, void gfs2_consist_rgrpd_i(struct gfs2_rgrpd *rgd,
const char *function, char *file, unsigned int line); const char *function, char *file, unsigned int line);
#define gfs2_consist_rgrpd(rgd) \ #define gfs2_consist_rgrpd(rgd) \
gfs2_consist_rgrpd_i((rgd), __func__, __FILE__, __LINE__) gfs2_consist_rgrpd_i((rgd), __func__, __FILE__, __LINE__)