AFS: AFS fixups

Make some miscellaneous changes to the AFS filesystem:

 (1) Assert RCU barriers on module exit to make sure RCU has finished with
     callbacks in this module.

 (2) Correctly handle the AFS server returning a zero-length read.

 (3) Split out data zapping calls into one function (afs_zap_data).

 (4) Rename some afs_file_*() functions to afs_*() where they apply to
     non-regular files too.

 (5) Be consistent about the presentation of volume ID:vnode ID in debugging
     output.

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>

1 files changed, 7 insertions, 7 deletions

diff --git a/fs/afs/vnode.c b/fs/afs/vnode.c
index a1904ab8426a..0e37f9949cb7 100644
--- a/fs/afs/vnode.c
+++ b/fs/afs/vnode.c
@@ -261,7 +261,7 @@ int afs_vnode_fetch_status(struct afs_vnode *vnode,
 
         DECLARE_WAITQUEUE(myself, current);
 
-        _enter("%s,{%u,%u,%u}",
+        _enter("%s,{%x:%u.%u}",
                vnode->volume->vlocation->vldb.name,
                vnode->fid.vid, vnode->fid.vnode, vnode->fid.unique);
 
@@ -389,7 +389,7 @@ int afs_vnode_fetch_data(struct afs_vnode *vnode, struct key *key,
         struct afs_server *server;
         int ret;
 
-        _enter("%s{%u,%u,%u},%x,,,",
+        _enter("%s{%x:%u.%u},%x,,,",
                vnode->volume->vlocation->vldb.name,
                vnode->fid.vid,
                vnode->fid.vnode,
@@ -446,7 +446,7 @@ int afs_vnode_create(struct afs_vnode *vnode, struct key *key,
         struct afs_server *server;
         int ret;
 
-        _enter("%s{%u,%u,%u},%x,%s,,",
+        _enter("%s{%x:%u.%u},%x,%s,,",
                vnode->volume->vlocation->vldb.name,
                vnode->fid.vid,
                vnode->fid.vnode,
@@ -502,7 +502,7 @@ int afs_vnode_remove(struct afs_vnode *vnode, struct key *key, const char *name,
         struct afs_server *server;
         int ret;
 
-        _enter("%s{%u,%u,%u},%x,%s",
+        _enter("%s{%x:%u.%u},%x,%s",
                vnode->volume->vlocation->vldb.name,
                vnode->fid.vid,
                vnode->fid.vnode,
@@ -557,7 +557,7 @@ extern int afs_vnode_link(struct afs_vnode *dvnode, struct afs_vnode *vnode,
         struct afs_server *server;
         int ret;
 
-        _enter("%s{%u,%u,%u},%s{%u,%u,%u},%x,%s",
+        _enter("%s{%x:%u.%u},%s{%x:%u.%u},%x,%s",
                dvnode->volume->vlocation->vldb.name,
                dvnode->fid.vid,
                dvnode->fid.vnode,
@@ -628,7 +628,7 @@ int afs_vnode_symlink(struct afs_vnode *vnode, struct key *key,
         struct afs_server *server;
         int ret;
 
-        _enter("%s{%u,%u,%u},%x,%s,%s,,,",
+        _enter("%s{%x:%u.%u},%x,%s,%s,,,",
                vnode->volume->vlocation->vldb.name,
                vnode->fid.vid,
                vnode->fid.vnode,
@@ -687,7 +687,7 @@ int afs_vnode_rename(struct afs_vnode *orig_dvnode,
         struct afs_server *server;
         int ret;
 
-        _enter("%s{%u,%u,%u},%s{%u,%u,%u},%x,%s,%s",
+        _enter("%s{%x:%u.%u},%s{%u,%u,%u},%x,%s,%s",
                orig_dvnode->volume->vlocation->vldb.name,
                orig_dvnode->fid.vid,
                orig_dvnode->fid.vnode,