diff options
-rw-r--r-- | fs/ocfs2/journal.h | 1 | ||||
-rw-r--r-- | fs/ocfs2/ocfs2.h | 1 | ||||
-rw-r--r-- | fs/ocfs2/super.c | 6 |
3 files changed, 2 insertions, 6 deletions
diff --git a/fs/ocfs2/journal.h b/fs/ocfs2/journal.h index a3385b63ff5e..0a992737dcaf 100644 --- a/fs/ocfs2/journal.h +++ b/fs/ocfs2/journal.h | |||
@@ -200,7 +200,6 @@ void ocfs2_complete_quota_recovery(struct ocfs2_super *osb); | |||
200 | 200 | ||
201 | static inline void ocfs2_start_checkpoint(struct ocfs2_super *osb) | 201 | static inline void ocfs2_start_checkpoint(struct ocfs2_super *osb) |
202 | { | 202 | { |
203 | atomic_set(&osb->needs_checkpoint, 1); | ||
204 | wake_up(&osb->checkpoint_event); | 203 | wake_up(&osb->checkpoint_event); |
205 | } | 204 | } |
206 | 205 | ||
diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h index d355e6e36b36..3a903470c794 100644 --- a/fs/ocfs2/ocfs2.h +++ b/fs/ocfs2/ocfs2.h | |||
@@ -347,7 +347,6 @@ struct ocfs2_super | |||
347 | struct task_struct *recovery_thread_task; | 347 | struct task_struct *recovery_thread_task; |
348 | int disable_recovery; | 348 | int disable_recovery; |
349 | wait_queue_head_t checkpoint_event; | 349 | wait_queue_head_t checkpoint_event; |
350 | atomic_t needs_checkpoint; | ||
351 | struct ocfs2_journal *journal; | 350 | struct ocfs2_journal *journal; |
352 | unsigned long osb_commit_interval; | 351 | unsigned long osb_commit_interval; |
353 | 352 | ||
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index 01b85165552b..854d80955bf8 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c | |||
@@ -286,10 +286,9 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len) | |||
286 | spin_unlock(&osb->osb_lock); | 286 | spin_unlock(&osb->osb_lock); |
287 | 287 | ||
288 | out += snprintf(buf + out, len - out, | 288 | out += snprintf(buf + out, len - out, |
289 | "%10s => Pid: %d Interval: %lu Needs: %d\n", "Commit", | 289 | "%10s => Pid: %d Interval: %lu\n", "Commit", |
290 | (osb->commit_task ? task_pid_nr(osb->commit_task) : -1), | 290 | (osb->commit_task ? task_pid_nr(osb->commit_task) : -1), |
291 | osb->osb_commit_interval, | 291 | osb->osb_commit_interval); |
292 | atomic_read(&osb->needs_checkpoint)); | ||
293 | 292 | ||
294 | out += snprintf(buf + out, len - out, | 293 | out += snprintf(buf + out, len - out, |
295 | "%10s => State: %d TxnId: %lu NumTxns: %d\n", | 294 | "%10s => State: %d TxnId: %lu NumTxns: %d\n", |
@@ -2154,7 +2153,6 @@ static int ocfs2_initialize_super(struct super_block *sb, | |||
2154 | } | 2153 | } |
2155 | 2154 | ||
2156 | init_waitqueue_head(&osb->checkpoint_event); | 2155 | init_waitqueue_head(&osb->checkpoint_event); |
2157 | atomic_set(&osb->needs_checkpoint, 0); | ||
2158 | 2156 | ||
2159 | osb->s_atime_quantum = OCFS2_DEFAULT_ATIME_QUANTUM; | 2157 | osb->s_atime_quantum = OCFS2_DEFAULT_ATIME_QUANTUM; |
2160 | 2158 | ||