diff options
| author | Andreas Gruenbacher <agruenba@redhat.com> | 2020-01-23 19:31:06 +0100 |
|---|---|---|
| committer | Bob Peterson <rpeterso@redhat.com> | 2020-02-10 14:39:46 +0100 |
| commit | a5ca2f1cb66b1ef93bbd58b55b22cb50163a03db (patch) | |
| tree | 1a0a98d9ad6e6748b7bc97d89e79e9a6ac475c93 | |
| parent | gfs2: Remove usused cluster_wide arguments of gfs2_consist functions (diff) | |
| download | linux-a5ca2f1cb66b1ef93bbd58b55b22cb50163a03db.tar.xz linux-a5ca2f1cb66b1ef93bbd58b55b22cb50163a03db.zip | |
gfs2: Turn gfs2_consist into void functions
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>
| -rw-r--r-- | fs/gfs2/util.c | 24 | ||||
| -rw-r--r-- | fs/gfs2/util.h | 12 |
2 files changed, 15 insertions, 21 deletions
diff --git a/fs/gfs2/util.c b/fs/gfs2/util.c index 74247d686cf7..698eb5952438 100644 --- a/fs/gfs2/util.c +++ b/fs/gfs2/util.c @@ -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 - * 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, - char *file, unsigned int line) +void gfs2_consist_i(struct gfs2_sbd *sdp, const char *function, + char *file, unsigned int line) { gfs2_lm(sdp, "fatal: filesystem consistency error - function = %s, file = %s, line = %u\n", function, file, line); - return gfs2_withdraw(sdp); + gfs2_withdraw(sdp); } /** * 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, - const char *function, char *file, unsigned int line) +void gfs2_consist_inode_i(struct gfs2_inode *ip, + const char *function, char *file, unsigned int line) { 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_addr, function, file, line); - return gfs2_withdraw(sdp); + gfs2_withdraw(sdp); } /** * 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, - const char *function, char *file, unsigned int line) +void gfs2_consist_rgrpd_i(struct gfs2_rgrpd *rgd, + const char *function, char *file, unsigned int line) { struct gfs2_sbd *sdp = rgd->rd_sbd; 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", (unsigned long long)rgd->rd_addr, function, file, line); - return gfs2_withdraw(sdp); + gfs2_withdraw(sdp); } /** diff --git a/fs/gfs2/util.h b/fs/gfs2/util.h index 2c2940d55a35..93e089327216 100644 --- a/fs/gfs2/util.h +++ b/fs/gfs2/util.h @@ -52,22 +52,22 @@ int gfs2_assert_warn_i(struct gfs2_sbd *sdp, char *assertion, __func__, __FILE__, __LINE__)) -int gfs2_consist_i(struct gfs2_sbd *sdp, - const char *function, char *file, unsigned int line); +void gfs2_consist_i(struct gfs2_sbd *sdp, + const char *function, char *file, unsigned int line); #define gfs2_consist(sdp) \ gfs2_consist_i((sdp), __func__, __FILE__, __LINE__) -int gfs2_consist_inode_i(struct gfs2_inode *ip, - const char *function, char *file, unsigned int line); +void gfs2_consist_inode_i(struct gfs2_inode *ip, + const char *function, char *file, unsigned int line); #define gfs2_consist_inode(ip) \ gfs2_consist_inode_i((ip), __func__, __FILE__, __LINE__) -int gfs2_consist_rgrpd_i(struct gfs2_rgrpd *rgd, - const char *function, char *file, unsigned int line); +void gfs2_consist_rgrpd_i(struct gfs2_rgrpd *rgd, + const char *function, char *file, unsigned int line); #define gfs2_consist_rgrpd(rgd) \ gfs2_consist_rgrpd_i((rgd), __func__, __FILE__, __LINE__) |