exec: replace call_usermodehelper_pipe with use of umh init function and resolve...

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

diff --git a/fs/afs/callback.c b/fs/afs/callback.c
index 9bdbf36..587ef51 100644 (file)
--- a/fs/afs/callback.c
+++ b/fs/afs/callback.c
@@ -8,7 +8,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * Authors: David Woodhouse <dwmw2@cambridge.redhat.com>
+ * Authors: David Woodhouse <dwmw2@infradead.org>
  *          David Howells <dhowells@redhat.com>
  *
  */
@@ -17,9 +17,12 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/circ_buf.h>
+#include <linux/sched.h>
 #include "internal.h"
 
+#if 0
 unsigned afs_vnode_update_timeout = 10;
+#endif  /*  0  */
 
 #define afs_breakring_space(server) \
        CIRC_SPACE((server)->cb_break_head, (server)->cb_break_tail,    \
@@ -44,7 +47,7 @@ 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);
-               _debug("UNPROMISE { vid=%x vn=%u uq=%u}",
+               _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;
@@ -84,11 +87,8 @@ 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 {%x:%u}",
-                              vnode->fid.vid, vnode->fid.vnode);
-                       invalidate_remote_inode(&vnode->vfs_inode);
-               }
+               if (test_and_clear_bit(AFS_VNODE_ZAP_DATA, &vnode->flags))
+                       afs_zap_data(vnode);
        }
 
 out:
@@ -127,6 +127,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);
        }
 }