diff options
| author | Andreas Gruenbacher <agruenba@redhat.com> | 2024-02-27 22:57:08 +0100 |
|---|---|---|
| committer | Andreas Gruenbacher <agruenba@redhat.com> | 2024-04-09 18:35:57 +0200 |
| commit | 795405c4b995efc4f6b6b561200c384bdda07c02 (patch) | |
| tree | 7edb876f9e4cf0801873f6a3f2882ed33140debe /fs/gfs2 | |
| parent | b204b1b61eff8d5ac1aefcb00547a5f4002be47d (diff) | |
gfs2: Remove unnecessary gfs2_meta_check_ii argument
The type argument of gfs2_meta_check_ii() is always set to "magic
number", so remove that argument and hardcode the string in
gfs2_meta_check_ii(). Change the string to "bad magic number" to
emphasize that the problem is the incorrect magic number.
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Diffstat (limited to 'fs/gfs2')
| -rw-r--r-- | fs/gfs2/util.c | 6 | ||||
| -rw-r--r-- | fs/gfs2/util.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/fs/gfs2/util.c b/fs/gfs2/util.c index fd65a2e34102..963d77c4ca21 100644 --- a/fs/gfs2/util.c +++ b/fs/gfs2/util.c @@ -488,16 +488,16 @@ void gfs2_consist_rgrpd_i(struct gfs2_rgrpd *rgd, */ int gfs2_meta_check_ii(struct gfs2_sbd *sdp, struct buffer_head *bh, - const char *type, const char *function, char *file, + const char *function, char *file, unsigned int line) { int me; gfs2_lm(sdp, "fatal: invalid metadata block - " - "bh = %llu (%s), " + "bh = %llu (bad magic number), " "function = %s, file = %s, line = %u\n", - (unsigned long long)bh->b_blocknr, type, + (unsigned long long)bh->b_blocknr, function, file, line); me = gfs2_withdraw(sdp); return (me) ? -1 : -2; diff --git a/fs/gfs2/util.h b/fs/gfs2/util.h index ba071998461f..d8d62bf0424d 100644 --- a/fs/gfs2/util.h +++ b/fs/gfs2/util.h @@ -92,7 +92,7 @@ gfs2_consist_rgrpd_i((rgd), __func__, __FILE__, __LINE__) int gfs2_meta_check_ii(struct gfs2_sbd *sdp, struct buffer_head *bh, - const char *type, const char *function, + const char *function, char *file, unsigned int line); static inline int gfs2_meta_check(struct gfs2_sbd *sdp, @@ -123,7 +123,7 @@ static inline int gfs2_metatype_check_i(struct gfs2_sbd *sdp, u32 magic = be32_to_cpu(mh->mh_magic); u16 t = be32_to_cpu(mh->mh_type); if (unlikely(magic != GFS2_MAGIC)) - return gfs2_meta_check_ii(sdp, bh, "magic number", function, + return gfs2_meta_check_ii(sdp, bh, function, file, line); if (unlikely(t != type)) return gfs2_metatype_check_ii(sdp, bh, type, t, function, |