Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[cascardo/linux.git] / fs / ocfs2 / super.c

diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index 01b8516..854d809 100644 (file)
--- 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)
        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;