Skip to contentSkip to conversation

Remove unecessary variable needs_checkpoint

PATCH New Goldwyn Rodrigues 3 participants 3 messages Jun 7, 2013 OCFS2

lore
Share & tools
lore

Goldwyn Rodrigues

author
#0 lore raw

PATCH 1/1 Remove unecessary variable needs_checkpoint

Code cleanup: needs_checkpoint is only assigned but never used to check. Delete the variable.

Signed-off-by Goldwyn Rodrigues <[email protected]>

---

fs/ocfs2/journal.h +0 -1
index a3385b6..0a99273 100644
@@ -200,7 +200,6 @@ void ocfs2_complete_quota_recovery(struct ocfs2_super *osb);
 
 static inline void ocfs2_start_checkpoint(struct ocfs2_super *osb)
 {
-	atomic_set(&osb->needs_checkpoint, 1);
 	wake_up(&osb->checkpoint_event);
 }
fs/ocfs2/ocfs2.h +0 -1
index d355e6e..3a90347 100644
@@ -347,7 +347,6 @@ struct ocfs2_super
 	struct task_struct *recovery_thread_task;
 	int disable_recovery;
 	wait_queue_head_t checkpoint_event;
-	atomic_t needs_checkpoint;
 	struct ocfs2_journal *journal;
 	unsigned long osb_commit_interval;
fs/ocfs2/super.c +2 -4
index 01b8516..854d809 100644
@@ -286,10 +286,9 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
 	spin_unlock(&osb->osb_lock);
 
 	out += snprintf(buf + out, len - out,
-			"%10s => Pid: %d  Interval: %lu  Needs: %d\n", "Commit",
+			"%10s => Pid: %d  Interval: %lu\n", "Commit",
 			(osb->commit_task ? task_pid_nr(osb->commit_task) : -1),
-			osb->osb_commit_interval,
-			atomic_read(&osb->needs_checkpoint));
+			osb->osb_commit_interval);
 
 	out += snprintf(buf + out, len - out,
 			"%10s => State: %d  TxnId: %lu  NumTxns: %d\n",

@@ -2154,7 +2153,6 @@ static int ocfs2_initialize_super(struct super_block *sb,
 	}
 
 	init_waitqueue_head(&osb->checkpoint_event);
-	atomic_set(&osb->needs_checkpoint, 0);
 
 	osb->s_atime_quantum = OCFS2_DEFAULT_ATIME_QUANTUM;
#1 lore raw

PATCH 1/1 Remove unecessary variable needs_checkpoint

Quoted 48 lines · Goldwyn Rodrigues

Code cleanup: needs_checkpoint is only assigned but never used to check. Delete the variable.

Signed-off-by Goldwyn Rodrigues <[email protected]>

---

fs/ocfs2/journal.h +0 -1
index a3385b6..0a99273 100644
@@ -200,7 +200,6 @@ void ocfs2_complete_quota_recovery(struct ocfs2_super *osb);
 
 static inline void ocfs2_start_checkpoint(struct ocfs2_super *osb)
 {
-	atomic_set(&osb->needs_checkpoint, 1);
 	wake_up(&osb->checkpoint_event);
 }
fs/ocfs2/ocfs2.h +0 -1
index d355e6e..3a90347 100644
@@ -347,7 +347,6 @@ struct ocfs2_super
 	struct task_struct *recovery_thread_task;
 	int disable_recovery;
 	wait_queue_head_t checkpoint_event;
-	atomic_t needs_checkpoint;
 	struct ocfs2_journal *journal;
 	unsigned long osb_commit_interval;
fs/ocfs2/super.c +2 -3
index 01b8516..854d809 100644
@@ -286,10 +286,9 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
 	spin_unlock(&osb->osb_lock);
 
 	out += snprintf(buf + out, len - out,
-			"%10s => Pid: %d  Interval: %lu  Needs: %d\n", "Commit",
+			"%10s => Pid: %d  Interval: %lu\n", "Commit",
 			(osb->commit_task ? task_pid_nr(osb->commit_task) : -1),
-			osb->osb_commit_interval,
-			atomic_read(&osb->needs_checkpoint));
+			osb->osb_commit_interval);
 
 	out += snprintf(buf + out, len - out,
 			"%10s => State: %d  TxnId: %lu  NumTxns: %d\n",

fs/ocfs2/super.c static int ocfs2_initialize_super(struct super_block *sb, · line 2157

Quoted 6 lines
fs/ocfs2/super.c +0 -1
@@ -2154,7 +2153,6 @@ static int ocfs2_initialize_super(struct super_block *sb,
 	}
 
 	init_waitqueue_head(&osb->checkpoint_event);
-	atomic_set(&osb->needs_checkpoint, 0);
 
 	osb->s_atime_quantum = OCFS2_DEFAULT_ATIME_QUANTUM;

Found another corruption on above line when applying this patch :-P.

But never mind, I fixed it for saving your time.
This fix looks good to me, thank you.

-Jeff

From: Goldwyn Rodrigues <[email protected]>

Code cleanup: needs_checkpoint is only assigned but never used to check. Delete the variable.

Signed-off-by Goldwyn Rodrigues <[email protected]>
Reviewed-by Jie Liu <[email protected]>
---
 fs/ocfs2/journal.h |    1 -
 fs/ocfs2/ocfs2.h   |    1 -
 fs/ocfs2/super.c   |    6 ++----
 3 files changed, 2 insertions(+), 6 deletions(-)
fs/ocfs2/journal.h +0 -1
index a3385b6..0a99273 100644
@@ -200,7 +200,6 @@ void ocfs2_complete_quota_recovery(struct ocfs2_super *osb);
 
 static inline void ocfs2_start_checkpoint(struct ocfs2_super *osb)
 {
-	atomic_set(&osb->needs_checkpoint, 1);
 	wake_up(&osb->checkpoint_event);
 }
fs/ocfs2/ocfs2.h +0 -1
index d355e6e..3a90347 100644
@@ -347,7 +347,6 @@ struct ocfs2_super
 	struct task_struct *recovery_thread_task;
 	int disable_recovery;
 	wait_queue_head_t checkpoint_event;
-	atomic_t needs_checkpoint;
 	struct ocfs2_journal *journal;
 	unsigned long osb_commit_interval;
fs/ocfs2/super.c +2 -4
index 01b8516..854d809 100644
@@ -286,10 +286,9 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
 	spin_unlock(&osb->osb_lock);
 
 	out += snprintf(buf + out, len - out,
-			"%10s => Pid: %d  Interval: %lu  Needs: %d\n", "Commit",
+			"%10s => Pid: %d  Interval: %lu\n", "Commit",
 			(osb->commit_task ? task_pid_nr(osb->commit_task) : -1),
-			osb->osb_commit_interval,
-			atomic_read(&osb->needs_checkpoint));
+			osb->osb_commit_interval);
 
 	out += snprintf(buf + out, len - out,
 			"%10s => State: %d  TxnId: %lu  NumTxns: %d\n",

@@ -2154,7 +2153,6 @@ static int ocfs2_initialize_super(struct super_block *sb,
 	}
 
 	init_waitqueue_head(&osb->checkpoint_event);
-	atomic_set(&osb->needs_checkpoint, 0);
 
 	osb->s_atime_quantum = OCFS2_DEFAULT_ATIME_QUANTUM;
Signature · 1 line
1.7.9.5
maintainer
#2 lore raw

PATCH 1/1 Remove unecessary variable needs_checkpoint

Acked-by Joel Becker <[email protected]>
Quoted 134 lines · Jeff Liu
Quoted 48 lines · Goldwyn Rodrigues

Code cleanup: needs_checkpoint is only assigned but never used to check. Delete the variable.

Signed-off-by Goldwyn Rodrigues <[email protected]>

---

fs/ocfs2/journal.h +0 -1
index a3385b6..0a99273 100644
@@ -200,7 +200,6 @@ void ocfs2_complete_quota_recovery(struct ocfs2_super *osb);
 
 static inline void ocfs2_start_checkpoint(struct ocfs2_super *osb)
 {
-	atomic_set(&osb->needs_checkpoint, 1);
 	wake_up(&osb->checkpoint_event);
 }
fs/ocfs2/ocfs2.h +0 -1
index d355e6e..3a90347 100644
@@ -347,7 +347,6 @@ struct ocfs2_super
 	struct task_struct *recovery_thread_task;
 	int disable_recovery;
 	wait_queue_head_t checkpoint_event;
-	atomic_t needs_checkpoint;
 	struct ocfs2_journal *journal;
 	unsigned long osb_commit_interval;
fs/ocfs2/super.c +2 -3
index 01b8516..854d809 100644
@@ -286,10 +286,9 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
 	spin_unlock(&osb->osb_lock);
 
 	out += snprintf(buf + out, len - out,
-			"%10s => Pid: %d  Interval: %lu  Needs: %d\n", "Commit",
+			"%10s => Pid: %d  Interval: %lu\n", "Commit",
 			(osb->commit_task ? task_pid_nr(osb->commit_task) : -1),
-			osb->osb_commit_interval,
-			atomic_read(&osb->needs_checkpoint));
+			osb->osb_commit_interval);
 
 	out += snprintf(buf + out, len - out,
 			"%10s => State: %d  TxnId: %lu  NumTxns: %d\n",

fs/ocfs2/super.c static int ocfs2_initialize_super(struct super_block *sb, · line 2157

Quoted 6 lines
fs/ocfs2/super.c +0 -1
@@ -2154,7 +2153,6 @@ static int ocfs2_initialize_super(struct super_block *sb,
 	}
 
 	init_waitqueue_head(&osb->checkpoint_event);
-	atomic_set(&osb->needs_checkpoint, 0);
 
 	osb->s_atime_quantum = OCFS2_DEFAULT_ATIME_QUANTUM;

Found another corruption on above line when applying this patch :-P.

But never mind, I fixed it for saving your time.
This fix looks good to me, thank you.

-Jeff

From: Goldwyn Rodrigues <[email protected]>

Code cleanup: needs_checkpoint is only assigned but never used to check. Delete the variable.

Signed-off-by Goldwyn Rodrigues <[email protected]>
Reviewed-by Jie Liu <[email protected]>
---
 fs/ocfs2/journal.h |    1 -
 fs/ocfs2/ocfs2.h   |    1 -
 fs/ocfs2/super.c   |    6 ++----
 3 files changed, 2 insertions(+), 6 deletions(-)
fs/ocfs2/journal.h +0 -1
index a3385b6..0a99273 100644
@@ -200,7 +200,6 @@ void ocfs2_complete_quota_recovery(struct ocfs2_super *osb);
 
 static inline void ocfs2_start_checkpoint(struct ocfs2_super *osb)
 {
-	atomic_set(&osb->needs_checkpoint, 1);
 	wake_up(&osb->checkpoint_event);
 }
fs/ocfs2/ocfs2.h +0 -1
index d355e6e..3a90347 100644
@@ -347,7 +347,6 @@ struct ocfs2_super
 	struct task_struct *recovery_thread_task;
 	int disable_recovery;
 	wait_queue_head_t checkpoint_event;
-	atomic_t needs_checkpoint;
 	struct ocfs2_journal *journal;
 	unsigned long osb_commit_interval;
fs/ocfs2/super.c +2 -4
index 01b8516..854d809 100644
@@ -286,10 +286,9 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
 	spin_unlock(&osb->osb_lock);
 
 	out += snprintf(buf + out, len - out,
-			"%10s => Pid: %d  Interval: %lu  Needs: %d\n", "Commit",
+			"%10s => Pid: %d  Interval: %lu\n", "Commit",
 			(osb->commit_task ? task_pid_nr(osb->commit_task) : -1),
-			osb->osb_commit_interval,
-			atomic_read(&osb->needs_checkpoint));
+			osb->osb_commit_interval);
 
 	out += snprintf(buf + out, len - out,
 			"%10s => State: %d  TxnId: %lu  NumTxns: %d\n",

@@ -2154,7 +2153,6 @@ static int ocfs2_initialize_super(struct super_block *sb,
 	}
 
 	init_waitqueue_head(&osb->checkpoint_event);
-	atomic_set(&osb->needs_checkpoint, 0);
 
 	osb->s_atime_quantum = OCFS2_DEFAULT_ATIME_QUANTUM;
Signature · 6 lines
1.7.9.5

_______________________________________________
Ocfs2-devel mailing list
Ocfs2-devel at oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel
Signature · 6 lines
"If you took all of the grains of sand in the world, and lined
 them up end to end in a row, you'd be working for the government!"
	- Mr. Interesting

			http://www.jlbec.org/
			jlbec at evilplan.org