Merge branch 'audit.b49' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit...

[sfrench/cifs-2.6.git] / fs / afs / server.c

diff --git a/fs/afs/server.c b/fs/afs/server.c
index 96bb23b476a2f4282a03a07a9a146d2e4d1b2e24..28f2451419e1406b3be0aa0a0258fe14f73a0834 100644 (file)
--- a/fs/afs/server.c
+++ b/fs/afs/server.c
@@ -13,7 +13,7 @@
 #include <linux/slab.h>
 #include "internal.h"
 
-unsigned afs_server_timeout = 10;      /* server timeout in seconds */
+static unsigned afs_server_timeout = 10;       /* server timeout in seconds */
 
 static void afs_reap_server(struct work_struct *);
 
@@ -252,6 +252,9 @@ static void afs_destroy_server(struct afs_server *server)
 {
        _enter("%p", server);
 
+       ASSERTIF(server->cb_break_head != server->cb_break_tail,
+                delayed_work_pending(&server->cb_break_work));
+
        ASSERTCMP(server->fs_vnodes.rb_node, ==, NULL);
        ASSERTCMP(server->cb_promises.rb_node, ==, NULL);
        ASSERTCMP(server->cb_break_head, ==, server->cb_break_tail);