]> err.no Git - linux-2.6/commitdiff
AFS: fix a couple of problems with unlinking AFS files
authorDavid Howells <dhowells@redhat.com>
Fri, 11 May 2007 05:22:20 +0000 (22:22 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 11 May 2007 15:29:32 +0000 (08:29 -0700)
Fix a couple of problems with unlinking AFS files.

 (1) The parent directory wasn't being updated properly between unlink() and
     the following lookup().

     It seems that, for some reason, invalidate_remote_inode() wasn't
     discarding the directory contents correctly, so this patch calls
     invalidate_inode_pages2() instead on non-regular files.

 (2) afs_vnode_deleted_remotely() should handle vnodes that don't have a
     source server recorded without oopsing.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/afs/file.c
fs/afs/inode.c
fs/afs/super.c
fs/afs/vnode.c

index 3e25795e5a4243ca26315d847c0e6a42fa93e087..9c0e721d9fc219fff078507b879b92b7ae41b1fb 100644 (file)
@@ -236,7 +236,7 @@ static void afs_invalidatepage(struct page *page, unsigned long offset)
 {
        int ret = 1;
 
-       kenter("{%lu},%lu", page->index, offset);
+       _enter("{%lu},%lu", page->index, offset);
 
        BUG_ON(!PageLocked(page));
 
index 515a5d12d8fb5d49d69a6f896ac33c2dfdbdf859..47f5fed7195dbbf11cc6ea9a1b7e2ca6f43cdbc3 100644 (file)
@@ -209,11 +209,15 @@ bad_inode:
  */
 void afs_zap_data(struct afs_vnode *vnode)
 {
-       _enter("zap data {%x:%u}", vnode->fid.vid, vnode->fid.vnode);
+       _enter("{%x:%u}", vnode->fid.vid, vnode->fid.vnode);
 
        /* nuke all the non-dirty pages that aren't locked, mapped or being
-        * written back */
-       invalidate_remote_inode(&vnode->vfs_inode);
+        * written back in a regular file and completely discard the pages in a
+        * directory or symlink */
+       if (S_ISREG(vnode->vfs_inode.i_mode))
+               invalidate_remote_inode(&vnode->vfs_inode);
+       else
+               invalidate_inode_pages2(vnode->vfs_inode.i_mapping);
 }
 
 /*
index d24be334b6089c592068634de7f613d8f2114f27..422f532b9b62774f013759d4e93dbea21223c395 100644 (file)
@@ -488,6 +488,7 @@ static struct inode *afs_alloc_inode(struct super_block *sb)
        vnode->flags            = 1 << AFS_VNODE_UNSET;
        vnode->cb_promised      = false;
 
+       _leave(" = %p", &vnode->vfs_inode);
        return &vnode->vfs_inode;
 }
 
@@ -498,7 +499,7 @@ static void afs_destroy_inode(struct inode *inode)
 {
        struct afs_vnode *vnode = AFS_FS_I(inode);
 
-       _enter("{%lu}", inode->i_ino);
+       _enter("%p{%x:%u}", inode, vnode->fid.vid, vnode->fid.vnode);
 
        _debug("DESTROY INODE %p", inode);
 
index ec814660209faf83abe40e3a9a831d445243dba3..bea8bd9e7b2a2eedfc4fdade3767b86d8e6a7dfb 100644 (file)
@@ -175,24 +175,33 @@ static void afs_vnode_deleted_remotely(struct afs_vnode *vnode)
 {
        struct afs_server *server;
 
+       _enter("{%p}", vnode->server);
+
        set_bit(AFS_VNODE_DELETED, &vnode->flags);
 
        server = vnode->server;
-       if (vnode->cb_promised) {
-               spin_lock(&server->cb_lock);
+       if (server) {
                if (vnode->cb_promised) {
-                       rb_erase(&vnode->cb_promise, &server->cb_promises);
-                       vnode->cb_promised = false;
+                       spin_lock(&server->cb_lock);
+                       if (vnode->cb_promised) {
+                               rb_erase(&vnode->cb_promise,
+                                        &server->cb_promises);
+                               vnode->cb_promised = false;
+                       }
+                       spin_unlock(&server->cb_lock);
                }
-               spin_unlock(&server->cb_lock);
-       }
 
-       spin_lock(&vnode->server->fs_lock);
-       rb_erase(&vnode->server_rb, &vnode->server->fs_vnodes);
-       spin_unlock(&vnode->server->fs_lock);
+               spin_lock(&server->fs_lock);
+               rb_erase(&vnode->server_rb, &server->fs_vnodes);
+               spin_unlock(&server->fs_lock);
 
-       vnode->server = NULL;
-       afs_put_server(server);
+               vnode->server = NULL;
+               afs_put_server(server);
+       } else {
+               ASSERT(!vnode->cb_promised);
+       }
+
+       _leave("");
 }
 
 /*
@@ -225,7 +234,7 @@ void afs_vnode_finalise_status_update(struct afs_vnode *vnode,
  */
 static void afs_vnode_status_update_failed(struct afs_vnode *vnode, int ret)
 {
-       _enter("%p,%d", vnode, ret);
+       _enter("{%x:%u},%d", vnode->fid.vid, vnode->fid.vnode, ret);
 
        spin_lock(&vnode->lock);