aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/gfs2/incore.h1
-rw-r--r--fs/gfs2/log.c13
-rw-r--r--fs/gfs2/super.c1
-rw-r--r--fs/gfs2/sys.c2
4 files changed, 0 insertions, 17 deletions
diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index 7ae0206e9a61..330f4c73d0e7 100644
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -411,7 +411,6 @@ struct gfs2_tune {
411 unsigned int gt_demote_secs; /* Cache retention for unheld glock */ 411 unsigned int gt_demote_secs; /* Cache retention for unheld glock */
412 unsigned int gt_incore_log_blocks; 412 unsigned int gt_incore_log_blocks;
413 unsigned int gt_log_flush_secs; 413 unsigned int gt_log_flush_secs;
414 unsigned int gt_jindex_refresh_secs; /* Check for new journal index */
415 414
416 unsigned int gt_recoverd_secs; 415 unsigned int gt_recoverd_secs;
417 unsigned int gt_logd_secs; 416 unsigned int gt_logd_secs;
diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c
index e88a684b2209..4dcc7a8cda22 100644
--- a/fs/gfs2/log.c
+++ b/fs/gfs2/log.c
@@ -28,7 +28,6 @@
28#include "meta_io.h" 28#include "meta_io.h"
29#include "util.h" 29#include "util.h"
30#include "dir.h" 30#include "dir.h"
31#include "super.h"
32 31
33#define PULL 1 32#define PULL 1
34 33
@@ -874,7 +873,6 @@ void gfs2_meta_syncfs(struct gfs2_sbd *sdp)
874int gfs2_logd(void *data) 873int gfs2_logd(void *data)
875{ 874{
876 struct gfs2_sbd *sdp = data; 875 struct gfs2_sbd *sdp = data;
877 struct gfs2_holder ji_gh;
878 unsigned long t; 876 unsigned long t;
879 int need_flush; 877 int need_flush;
880 878
@@ -893,17 +891,6 @@ int gfs2_logd(void *data)
893 sdp->sd_log_flush_time = jiffies; 891 sdp->sd_log_flush_time = jiffies;
894 } 892 }
895 893
896 /* Check for latest journal index */
897
898 t = sdp->sd_jindex_refresh_time +
899 gfs2_tune_get(sdp, gt_jindex_refresh_secs) * HZ;
900
901 if (time_after_eq(jiffies, t)) {
902 if (!gfs2_jindex_hold(sdp, &ji_gh))
903 gfs2_glock_dq_uninit(&ji_gh);
904 sdp->sd_jindex_refresh_time = jiffies;
905 }
906
907 t = gfs2_tune_get(sdp, gt_logd_secs) * HZ; 894 t = gfs2_tune_get(sdp, gt_logd_secs) * HZ;
908 if (freezing(current)) 895 if (freezing(current))
909 refrigerator(); 896 refrigerator();
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index 548cc8ba0703..2e74792ee487 100644
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -54,7 +54,6 @@ void gfs2_tune_init(struct gfs2_tune *gt)
54 gt->gt_demote_secs = 300; 54 gt->gt_demote_secs = 300;
55 gt->gt_incore_log_blocks = 1024; 55 gt->gt_incore_log_blocks = 1024;
56 gt->gt_log_flush_secs = 60; 56 gt->gt_log_flush_secs = 60;
57 gt->gt_jindex_refresh_secs = 60;
58 gt->gt_recoverd_secs = 60; 57 gt->gt_recoverd_secs = 60;
59 gt->gt_logd_secs = 1; 58 gt->gt_logd_secs = 1;
60 gt->gt_quotad_secs = 5; 59 gt->gt_quotad_secs = 5;
diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c
index 65dd0657e1f8..7f828a2cc858 100644
--- a/fs/gfs2/sys.c
+++ b/fs/gfs2/sys.c
@@ -428,7 +428,6 @@ TUNE_ATTR_2(name, name##_store)
428TUNE_ATTR(demote_secs, 0); 428TUNE_ATTR(demote_secs, 0);
429TUNE_ATTR(incore_log_blocks, 0); 429TUNE_ATTR(incore_log_blocks, 0);
430TUNE_ATTR(log_flush_secs, 0); 430TUNE_ATTR(log_flush_secs, 0);
431TUNE_ATTR(jindex_refresh_secs, 0);
432TUNE_ATTR(quota_warn_period, 0); 431TUNE_ATTR(quota_warn_period, 0);
433TUNE_ATTR(quota_quantum, 0); 432TUNE_ATTR(quota_quantum, 0);
434TUNE_ATTR(atime_quantum, 0); 433TUNE_ATTR(atime_quantum, 0);
@@ -450,7 +449,6 @@ static struct attribute *tune_attrs[] = {
450 &tune_attr_demote_secs.attr, 449 &tune_attr_demote_secs.attr,
451 &tune_attr_incore_log_blocks.attr, 450 &tune_attr_incore_log_blocks.attr,
452 &tune_attr_log_flush_secs.attr, 451 &tune_attr_log_flush_secs.attr,
453 &tune_attr_jindex_refresh_secs.attr,
454 &tune_attr_quota_warn_period.attr, 452 &tune_attr_quota_warn_period.attr,
455 &tune_attr_quota_quantum.attr, 453 &tune_attr_quota_quantum.attr,
456 &tune_attr_atime_quantum.attr, 454 &tune_attr_atime_quantum.attr,