Merge git://git.infradead.org/~dwmw2/battery-2.6

[linux-2.6] / fs / afs / callback.c

diff --git a/fs/afs/callback.c b/fs/afs/callback.c
index 611215547142c2cd4d0430e360974543fdc667e6..bacf518c6fa80d891f24e1168a82abf1a48d2d62 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;
@@ -44,7 +45,8 @@ void afs_init_callback_state(struct afs_server *server)
        while (!RB_EMPTY_ROOT(&server->cb_promises)) {
                vnode = rb_entry(server->cb_promises.rb_node,
                                 struct afs_vnode, cb_promise);
-               printk("\nUNPROMISE on %p\n", vnode);
+               _debug("UNPROMISE { vid=%x:%u uq=%u}",
+                      vnode->fid.vid, vnode->fid.vnode, vnode->fid.unique);
                rb_erase(&vnode->cb_promise, &server->cb_promises);
                vnode->cb_promised = false;
        }
@@ -68,11 +70,14 @@ void afs_broken_callback_work(struct work_struct *work)
 
        /* we're only interested in dealing with a broken callback on *this*
         * vnode and only if no-one else has dealt with it yet */
-       if (!mutex_trylock(&vnode->cb_broken_lock))
+       if (!mutex_trylock(&vnode->validate_lock))
                return; /* someone else is dealing with it */
 
        if (test_bit(AFS_VNODE_CB_BROKEN, &vnode->flags)) {
-               if (afs_vnode_fetch_status(vnode) < 0)
+               if (S_ISDIR(vnode->vfs_inode.i_mode))
+                       afs_clear_permits(vnode);
+
+               if (afs_vnode_fetch_status(vnode, NULL, NULL) < 0)
                        goto out;
 
                if (test_bit(AFS_VNODE_DELETED, &vnode->flags))
@@ -80,14 +85,12 @@ void afs_broken_callback_work(struct work_struct *work)
 
                /* if the vnode's data version number changed then its contents
                 * are different */
-               if (test_and_clear_bit(AFS_VNODE_ZAP_DATA, &vnode->flags)) {
-                       _debug("zap data");
-                       invalidate_remote_inode(&vnode->vfs_inode);
-               }
+               if (test_and_clear_bit(AFS_VNODE_ZAP_DATA, &vnode->flags))
+                       afs_zap_data(vnode);
        }
 
 out:
-       mutex_unlock(&vnode->cb_broken_lock);
+       mutex_unlock(&vnode->validate_lock);
 
        /* avoid the potential race whereby the mutex_trylock() in this
         * function happens again between the clear_bit() and the
@@ -248,6 +251,32 @@ static void afs_do_give_up_callback(struct afs_server *server,
        _leave("");
 }
 
+/*
+ * discard the callback on a deleted item
+ */
+void afs_discard_callback_on_delete(struct afs_vnode *vnode)
+{
+       struct afs_server *server = vnode->server;
+
+       _enter("%d", vnode->cb_promised);
+
+       if (!vnode->cb_promised) {
+               _leave(" [not promised]");
+               return;
+       }
+
+       ASSERT(server != NULL);
+
+       spin_lock(&server->cb_lock);
+       if (vnode->cb_promised) {
+               ASSERT(server->cb_promises.rb_node != NULL);
+               rb_erase(&vnode->cb_promise, &server->cb_promises);
+               vnode->cb_promised = false;
+       }
+       spin_unlock(&server->cb_lock);
+       _leave("");
+}
+
 /*
  * give up the callback registered for a vnode on the file server when the
  * inode is being cleared
@@ -437,7 +466,7 @@ int __init afs_callback_update_init(void)
 /*
  * shut down the callback update process
  */
-void __exit afs_callback_update_kill(void)
+void afs_callback_update_kill(void)
 {
        destroy_workqueue(afs_callback_update_worker);
 }