---

yaml --- r: 190786 b: refs/heads/master c: 11cad32 h: refs/heads/master v: v3
git-mirror · May 12, 2010 · 8484d2b · 8484d2b
1 parent 21a6afe
commit 8484d2b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab941e0fff3947b6dcc9c578d918d1bba54a6874
+refs/heads/master: 11cad320a4f4bc53d3585c85600c782faa12b99e
diff --git a/trunk/kernel/acct.c b/trunk/kernel/acct.c
@@ -353,17 +353,18 @@ void acct_auto_close(struct super_block *sb)
 
 void acct_exit_ns(struct pid_namespace *ns)
 {
-	struct bsd_acct_struct *acct;
+	struct bsd_acct_struct *acct = ns->bacct;
 
-	spin_lock(&acct_lock);
-	acct = ns->bacct;
-	if (acct != NULL) {
-		if (acct->file != NULL)
-			acct_file_reopen(acct, NULL, NULL);
+	if (acct == NULL)
+		return;
 
-		kfree(acct);
-	}
+	del_timer_sync(&acct->timer);
+	spin_lock(&acct_lock);
+	if (acct->file != NULL)
+		acct_file_reopen(acct, NULL, NULL);
 	spin_unlock(&acct_lock);
+
+	kfree(acct);
 }
 
 /*