summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2019-10-31 00:02:19 -0400
committerKent Overstreet <kent.overstreet@gmail.com>2020-11-07 16:57:15 -0500
commit127f9c506b5162657561a641bf7f7942ff012c04 (patch)
treedae991f468b189034efc1291cbcc2c3e136e13f8
parent053b088c296b70de4948c4a07ab3aaa8fc7c1e8e (diff)
disable flush/fua & time stats
-rw-r--r--fs/bcachefs/io.c2
-rw-r--r--fs/bcachefs/journal_io.c2
-rw-r--r--fs/bcachefs/util.h2
3 files changed, 4 insertions, 2 deletions
diff --git a/fs/bcachefs/io.c b/fs/bcachefs/io.c
index 21087d1193dc..fd11c7b4ca8e 100644
--- a/fs/bcachefs/io.c
+++ b/fs/bcachefs/io.c
@@ -104,6 +104,7 @@ static inline void bch2_congested_acct(struct bch_dev *ca, u64 io_latency,
void bch2_latency_acct(struct bch_dev *ca, u64 submit_time, int rw)
{
+#if 0
atomic64_t *latency = &ca->cur_latency[rw];
u64 now = local_clock();
u64 io_latency = time_after64(now, submit_time)
@@ -129,6 +130,7 @@ void bch2_latency_acct(struct bch_dev *ca, u64 submit_time, int rw)
bch2_congested_acct(ca, io_latency, now, rw);
__bch2_time_stats_update(&ca->io_latency[rw], submit_time, now);
+#endif
}
/* Allocate, free from mempool: */
diff --git a/fs/bcachefs/journal_io.c b/fs/bcachefs/journal_io.c
index bd0e6b371701..5b11037c9e02 100644
--- a/fs/bcachefs/journal_io.c
+++ b/fs/bcachefs/journal_io.c
@@ -1149,7 +1149,7 @@ retry_alloc:
bio->bi_end_io = journal_write_endio;
bio->bi_private = ca;
bio_set_op_attrs(bio, REQ_OP_WRITE,
- REQ_SYNC|REQ_META|REQ_PREFLUSH|REQ_FUA);
+ REQ_SYNC|REQ_META);
bch2_bio_map(bio, jset, sectors << 9);
trace_journal_write(bio);
diff --git a/fs/bcachefs/util.h b/fs/bcachefs/util.h
index 6e5335440b4b..a274d65f97b4 100644
--- a/fs/bcachefs/util.h
+++ b/fs/bcachefs/util.h
@@ -384,7 +384,7 @@ void __bch2_time_stats_update(struct time_stats *stats, u64, u64);
static inline void bch2_time_stats_update(struct time_stats *stats, u64 start)
{
- __bch2_time_stats_update(stats, start, local_clock());
+ //__bch2_time_stats_update(stats, start, local_clock());
}
void bch2_time_stats_to_text(struct printbuf *, struct time_stats *);