diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h index 7ae0206e9a61107c0876da911e125dd55a4f1838..330f4c73d0e758e91d3e47ab2d9d59c359720847 100644 --- a/fs/gfs2/incore.h +++ b/fs/gfs2/incore.h @@ -411,7 +411,6 @@ struct gfs2_tune { unsigned int gt_demote_secs; /* Cache retention for unheld glock */ unsigned int gt_incore_log_blocks; unsigned int gt_log_flush_secs; - unsigned int gt_jindex_refresh_secs; /* Check for new journal index */ unsigned int gt_recoverd_secs; unsigned int gt_logd_secs; diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c index e88a684b2209cd8a3eed7454b3e1cf882184e6e8..4dcc7a8cda22eedfd9b2cb121599e3276e28ce8c 100644 --- a/fs/gfs2/log.c +++ b/fs/gfs2/log.c @@ -28,7 +28,6 @@ #include "meta_io.h" #include "util.h" #include "dir.h" -#include "super.h" #define PULL 1 @@ -874,7 +873,6 @@ void gfs2_meta_syncfs(struct gfs2_sbd *sdp) int gfs2_logd(void *data) { struct gfs2_sbd *sdp = data; - struct gfs2_holder ji_gh; unsigned long t; int need_flush; @@ -893,17 +891,6 @@ int gfs2_logd(void *data) sdp->sd_log_flush_time = jiffies; } - /* Check for latest journal index */ - - t = sdp->sd_jindex_refresh_time + - gfs2_tune_get(sdp, gt_jindex_refresh_secs) * HZ; - - if (time_after_eq(jiffies, t)) { - if (!gfs2_jindex_hold(sdp, &ji_gh)) - gfs2_glock_dq_uninit(&ji_gh); - sdp->sd_jindex_refresh_time = jiffies; - } - t = gfs2_tune_get(sdp, gt_logd_secs) * HZ; if (freezing(current)) refrigerator(); diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c index 548cc8ba070312f64cd5675d541243e09984ebad..2e74792ee487d0750f0aba162c333e25b2b1044c 100644 --- a/fs/gfs2/super.c +++ b/fs/gfs2/super.c @@ -54,7 +54,6 @@ void gfs2_tune_init(struct gfs2_tune *gt) gt->gt_demote_secs = 300; gt->gt_incore_log_blocks = 1024; gt->gt_log_flush_secs = 60; - gt->gt_jindex_refresh_secs = 60; gt->gt_recoverd_secs = 60; gt->gt_logd_secs = 1; gt->gt_quotad_secs = 5; diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c index 65dd0657e1f8620f228e9da7fc90374ad8a859f1..7f828a2cc858dc061278f3cf980eec8df2883674 100644 --- a/fs/gfs2/sys.c +++ b/fs/gfs2/sys.c @@ -428,7 +428,6 @@ TUNE_ATTR_2(name, name##_store) TUNE_ATTR(demote_secs, 0); TUNE_ATTR(incore_log_blocks, 0); TUNE_ATTR(log_flush_secs, 0); -TUNE_ATTR(jindex_refresh_secs, 0); TUNE_ATTR(quota_warn_period, 0); TUNE_ATTR(quota_quantum, 0); TUNE_ATTR(atime_quantum, 0); @@ -450,7 +449,6 @@ static struct attribute *tune_attrs[] = { &tune_attr_demote_secs.attr, &tune_attr_incore_log_blocks.attr, &tune_attr_log_flush_secs.attr, - &tune_attr_jindex_refresh_secs.attr, &tune_attr_quota_warn_period.attr, &tune_attr_quota_quantum.attr, &tune_attr_atime_quantum.attr,