gfs2: Split gfs2_lm_withdraw into two functions
Split gfs2_lm_withdraw into a function that prints an error message and a function that withdraws the filesystem. Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com> Signed-off-by: Bob Peterson <rpeterso@redhat.com>
This commit is contained in:
parent
6e5e41e2dc
commit
badb55ec20
@ -39,7 +39,8 @@ static void gfs2_ail_error(struct gfs2_glock *gl, const struct buffer_head *bh)
|
||||
fs_err(gl->gl_name.ln_sbd, "AIL glock %u:%llu mapping %p\n",
|
||||
gl->gl_name.ln_type, gl->gl_name.ln_number,
|
||||
gfs2_glock2aspace(gl));
|
||||
gfs2_lm_withdraw(gl->gl_name.ln_sbd, "AIL error\n");
|
||||
gfs2_lm(gl->gl_name.ln_sbd, "AIL error\n");
|
||||
gfs2_withdraw(gl->gl_name.ln_sbd);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -165,7 +165,7 @@ restart:
|
||||
spin_unlock(&sdp->sd_ail_lock);
|
||||
blk_finish_plug(&plug);
|
||||
if (withdraw)
|
||||
gfs2_lm_withdraw(sdp, NULL);
|
||||
gfs2_withdraw(sdp);
|
||||
trace_gfs2_ail_flush(sdp, wbc, 0);
|
||||
}
|
||||
|
||||
@ -239,8 +239,10 @@ static int gfs2_ail1_empty(struct gfs2_sbd *sdp)
|
||||
ret = list_empty(&sdp->sd_ail1_list);
|
||||
spin_unlock(&sdp->sd_ail_lock);
|
||||
|
||||
if (withdraw)
|
||||
gfs2_lm_withdraw(sdp, "fatal: I/O error(s)\n");
|
||||
if (withdraw) {
|
||||
gfs2_lm(sdp, "fatal: I/O error(s)\n");
|
||||
gfs2_withdraw(sdp);
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
@ -1016,11 +1018,12 @@ int gfs2_logd(void *data)
|
||||
|
||||
/* Check for errors writing to the journal */
|
||||
if (sdp->sd_log_error) {
|
||||
gfs2_lm_withdraw(sdp,
|
||||
"GFS2: fsid=%s: error %d: "
|
||||
"withdrawing the file system to "
|
||||
"prevent further damage.\n",
|
||||
sdp->sd_fsname, sdp->sd_log_error);
|
||||
gfs2_lm(sdp,
|
||||
"GFS2: fsid=%s: error %d: "
|
||||
"withdrawing the file system to "
|
||||
"prevent further damage.\n",
|
||||
sdp->sd_fsname, sdp->sd_log_error);
|
||||
gfs2_withdraw(sdp);
|
||||
}
|
||||
|
||||
did_flush = false;
|
||||
|
@ -136,7 +136,8 @@ static ssize_t withdraw_store(struct gfs2_sbd *sdp, const char *buf, size_t len)
|
||||
if (val != 1)
|
||||
return -EINVAL;
|
||||
|
||||
gfs2_lm_withdraw(sdp, "withdrawing from cluster at user's request\n");
|
||||
gfs2_lm(sdp, "withdrawing from cluster at user's request\n");
|
||||
gfs2_withdraw(sdp);
|
||||
|
||||
return len;
|
||||
}
|
||||
|
124
fs/gfs2/util.c
124
fs/gfs2/util.c
@ -33,28 +33,31 @@ void gfs2_assert_i(struct gfs2_sbd *sdp)
|
||||
fs_emerg(sdp, "fatal assertion failed\n");
|
||||
}
|
||||
|
||||
int gfs2_lm_withdraw(struct gfs2_sbd *sdp, const char *fmt, ...)
|
||||
void gfs2_lm(struct gfs2_sbd *sdp, const char *fmt, ...)
|
||||
{
|
||||
struct va_format vaf;
|
||||
va_list args;
|
||||
|
||||
if (sdp->sd_args.ar_errors == GFS2_ERRORS_WITHDRAW &&
|
||||
test_bit(SDF_WITHDRAWN, &sdp->sd_flags))
|
||||
return;
|
||||
|
||||
va_start(args, fmt);
|
||||
vaf.fmt = fmt;
|
||||
vaf.va = &args;
|
||||
fs_err(sdp, "%pV", &vaf);
|
||||
va_end(args);
|
||||
}
|
||||
|
||||
int gfs2_withdraw(struct gfs2_sbd *sdp)
|
||||
{
|
||||
struct lm_lockstruct *ls = &sdp->sd_lockstruct;
|
||||
const struct lm_lockops *lm = ls->ls_ops;
|
||||
va_list args;
|
||||
struct va_format vaf;
|
||||
|
||||
if (sdp->sd_args.ar_errors == GFS2_ERRORS_WITHDRAW &&
|
||||
test_and_set_bit(SDF_WITHDRAWN, &sdp->sd_flags))
|
||||
return 0;
|
||||
|
||||
if (fmt) {
|
||||
va_start(args, fmt);
|
||||
|
||||
vaf.fmt = fmt;
|
||||
vaf.va = &args;
|
||||
|
||||
fs_err(sdp, "%pV", &vaf);
|
||||
|
||||
va_end(args);
|
||||
}
|
||||
|
||||
if (sdp->sd_args.ar_errors == GFS2_ERRORS_WITHDRAW) {
|
||||
fs_err(sdp, "about to withdraw this file system\n");
|
||||
BUG_ON(sdp->sd_args.ar_debug);
|
||||
@ -89,10 +92,12 @@ int gfs2_assert_withdraw_i(struct gfs2_sbd *sdp, char *assertion,
|
||||
const char *function, char *file, unsigned int line)
|
||||
{
|
||||
int me;
|
||||
me = gfs2_lm_withdraw(sdp,
|
||||
"fatal: assertion \"%s\" failed\n"
|
||||
" function = %s, file = %s, line = %u\n",
|
||||
assertion, function, file, line);
|
||||
|
||||
gfs2_lm(sdp,
|
||||
"fatal: assertion \"%s\" failed\n"
|
||||
" function = %s, file = %s, line = %u\n",
|
||||
assertion, function, file, line);
|
||||
me = gfs2_withdraw(sdp);
|
||||
dump_stack();
|
||||
return (me) ? -1 : -2;
|
||||
}
|
||||
@ -140,11 +145,10 @@ int gfs2_assert_warn_i(struct gfs2_sbd *sdp, char *assertion,
|
||||
int gfs2_consist_i(struct gfs2_sbd *sdp, int cluster_wide, const char *function,
|
||||
char *file, unsigned int line)
|
||||
{
|
||||
int rv;
|
||||
rv = gfs2_lm_withdraw(sdp,
|
||||
"fatal: filesystem consistency error - function = %s, file = %s, line = %u\n",
|
||||
function, file, line);
|
||||
return rv;
|
||||
gfs2_lm(sdp,
|
||||
"fatal: filesystem consistency error - function = %s, file = %s, line = %u\n",
|
||||
function, file, line);
|
||||
return gfs2_withdraw(sdp);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -157,15 +161,15 @@ int gfs2_consist_inode_i(struct gfs2_inode *ip, int cluster_wide,
|
||||
const char *function, char *file, unsigned int line)
|
||||
{
|
||||
struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);
|
||||
int rv;
|
||||
rv = gfs2_lm_withdraw(sdp,
|
||||
"fatal: filesystem consistency error\n"
|
||||
" inode = %llu %llu\n"
|
||||
" function = %s, file = %s, line = %u\n",
|
||||
(unsigned long long)ip->i_no_formal_ino,
|
||||
(unsigned long long)ip->i_no_addr,
|
||||
function, file, line);
|
||||
return rv;
|
||||
|
||||
gfs2_lm(sdp,
|
||||
"fatal: filesystem consistency error\n"
|
||||
" inode = %llu %llu\n"
|
||||
" function = %s, file = %s, line = %u\n",
|
||||
(unsigned long long)ip->i_no_formal_ino,
|
||||
(unsigned long long)ip->i_no_addr,
|
||||
function, file, line);
|
||||
return gfs2_withdraw(sdp);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -179,17 +183,16 @@ int gfs2_consist_rgrpd_i(struct gfs2_rgrpd *rgd, int cluster_wide,
|
||||
{
|
||||
struct gfs2_sbd *sdp = rgd->rd_sbd;
|
||||
char fs_id_buf[sizeof(sdp->sd_fsname) + 7];
|
||||
int rv;
|
||||
|
||||
sprintf(fs_id_buf, "fsid=%s: ", sdp->sd_fsname);
|
||||
gfs2_rgrp_dump(NULL, rgd->rd_gl, fs_id_buf);
|
||||
rv = gfs2_lm_withdraw(sdp,
|
||||
"fatal: filesystem consistency error\n"
|
||||
" RG = %llu\n"
|
||||
" function = %s, file = %s, line = %u\n",
|
||||
(unsigned long long)rgd->rd_addr,
|
||||
function, file, line);
|
||||
return rv;
|
||||
gfs2_lm(sdp,
|
||||
"fatal: filesystem consistency error\n"
|
||||
" RG = %llu\n"
|
||||
" function = %s, file = %s, line = %u\n",
|
||||
(unsigned long long)rgd->rd_addr,
|
||||
function, file, line);
|
||||
return gfs2_withdraw(sdp);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -203,12 +206,14 @@ int gfs2_meta_check_ii(struct gfs2_sbd *sdp, struct buffer_head *bh,
|
||||
unsigned int line)
|
||||
{
|
||||
int me;
|
||||
me = gfs2_lm_withdraw(sdp,
|
||||
"fatal: invalid metadata block\n"
|
||||
" bh = %llu (%s)\n"
|
||||
" function = %s, file = %s, line = %u\n",
|
||||
(unsigned long long)bh->b_blocknr, type,
|
||||
function, file, line);
|
||||
|
||||
gfs2_lm(sdp,
|
||||
"fatal: invalid metadata block\n"
|
||||
" bh = %llu (%s)\n"
|
||||
" function = %s, file = %s, line = %u\n",
|
||||
(unsigned long long)bh->b_blocknr, type,
|
||||
function, file, line);
|
||||
me = gfs2_withdraw(sdp);
|
||||
return (me) ? -1 : -2;
|
||||
}
|
||||
|
||||
@ -223,12 +228,14 @@ int gfs2_metatype_check_ii(struct gfs2_sbd *sdp, struct buffer_head *bh,
|
||||
char *file, unsigned int line)
|
||||
{
|
||||
int me;
|
||||
me = gfs2_lm_withdraw(sdp,
|
||||
"fatal: invalid metadata block\n"
|
||||
" bh = %llu (type: exp=%u, found=%u)\n"
|
||||
" function = %s, file = %s, line = %u\n",
|
||||
(unsigned long long)bh->b_blocknr, type, t,
|
||||
function, file, line);
|
||||
|
||||
gfs2_lm(sdp,
|
||||
"fatal: invalid metadata block\n"
|
||||
" bh = %llu (type: exp=%u, found=%u)\n"
|
||||
" function = %s, file = %s, line = %u\n",
|
||||
(unsigned long long)bh->b_blocknr, type, t,
|
||||
function, file, line);
|
||||
me = gfs2_withdraw(sdp);
|
||||
return (me) ? -1 : -2;
|
||||
}
|
||||
|
||||
@ -241,12 +248,11 @@ int gfs2_metatype_check_ii(struct gfs2_sbd *sdp, struct buffer_head *bh,
|
||||
int gfs2_io_error_i(struct gfs2_sbd *sdp, const char *function, char *file,
|
||||
unsigned int line)
|
||||
{
|
||||
int rv;
|
||||
rv = gfs2_lm_withdraw(sdp,
|
||||
"fatal: I/O error\n"
|
||||
" function = %s, file = %s, line = %u\n",
|
||||
function, file, line);
|
||||
return rv;
|
||||
gfs2_lm(sdp,
|
||||
"fatal: I/O error\n"
|
||||
" function = %s, file = %s, line = %u\n",
|
||||
function, file, line);
|
||||
return gfs2_withdraw(sdp);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -266,6 +272,6 @@ void gfs2_io_error_bh_i(struct gfs2_sbd *sdp, struct buffer_head *bh,
|
||||
(unsigned long long)bh->b_blocknr,
|
||||
function, file, line);
|
||||
if (withdraw)
|
||||
gfs2_lm_withdraw(sdp, NULL);
|
||||
gfs2_withdraw(sdp);
|
||||
}
|
||||
|
||||
|
@ -177,6 +177,7 @@ static inline bool gfs2_withdrawn(struct gfs2_sbd *sdp)
|
||||
gfs2_tune_get_i(&(sdp)->sd_tune, &(sdp)->sd_tune.field)
|
||||
|
||||
__printf(2, 3)
|
||||
int gfs2_lm_withdraw(struct gfs2_sbd *sdp, const char *fmt, ...);
|
||||
void gfs2_lm(struct gfs2_sbd *sdp, const char *fmt, ...);
|
||||
int gfs2_withdraw(struct gfs2_sbd *sdp);
|
||||
|
||||
#endif /* __UTIL_DOT_H__ */
|
||||
|
Loading…
Reference in New Issue
Block a user