Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

[linux-2.6-omap-h63xx.git] / fs / afs / callback.c

diff --git a/fs/afs/callback.c b/fs/afs/callback.c
index f64e40fefc02841d8c9625e556780e963c0f2090..b8243945818de3abd394435953acb8ed8e88eeef 100644 (file)
--- a/fs/afs/callback.c
+++ b/fs/afs/callback.c
@@ -17,6 +17,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/circ_buf.h>
+#include <linux/sched.h>
 #include "internal.h"
 
 unsigned afs_vnode_update_timeout = 10;
@@ -124,6 +125,9 @@ static void afs_break_callback(struct afs_server *server,
                spin_unlock(&server->cb_lock);
 
                queue_work(afs_callback_update_worker, &vnode->cb_broken_work);
+               if (list_empty(&vnode->granted_locks) &&
+                   !list_empty(&vnode->pending_locks))
+                       afs_lock_may_be_available(vnode);
                spin_unlock(&vnode->lock);
        }
 }