Merge AFS fixes

diff --cc fs/afs/dir.c
index 523b76623522c51d80fd228afa343a17ef5bf0cf,9fa70a82e28f8e416f3fb1a424f09de2564d4933..e66ad07124dcc8f8e6949a2b1ffae62430ae4ff6
--- 1/fs/afs/dir.c
--- 2/fs/afs/dir.c
+++ b/fs/afs/dir.c
@@@ -258,12 -256,12 +256,12 @@@ static int afs_dir_iterate_block(unsign
  
                /* got a valid entry */
                dire = &block->dirents[offset];
 -              nlen = strnlen(dire->u.name,sizeof(*block) - offset*sizeof(afs_dirent_t));
 +              nlen = strnlen(dire->parts.name,sizeof(*block) - offset*sizeof(afs_dirent_t));
  
-               _debug("ENT[%u.%u]: %s %u \"%.*s\"\n",
+               _debug("ENT[%Zu.%u]: %s %Zu \"%s\"\n",
                       blkoff/sizeof(afs_dir_block_t),offset,
-                      offset<curr ? "skip" : "fill",
-                      nlen,nlen,dire->name);
+                      (offset<curr ? "skip" : "fill"),
+                      nlen,dire->u.name);
  
                /* work out where the next possible entry is */
                for (tmp=nlen; tmp>15; tmp-=sizeof(afs_dirent_t)) {