4 files changed, 4 insertions, 5 deletions

diff --git a/fs/afs/callback.c b/fs/afs/callback.c
index 2fd62f89ae01..9cb206e9d4be 100644
--- a/fs/afs/callback.c
+++ b/fs/afs/callback.c
@@ -19,6 +19,7 @@
 #include "server.h"
 #include "vnode.h"
 #include "internal.h"
+#include "cmservice.h"
 
 /*****************************************************************************/
 /*
diff --git a/fs/afs/cmservice.c b/fs/afs/cmservice.c
index 0a57fd7c726f..9eef6bf156ab 100644
--- a/fs/afs/cmservice.c
+++ b/fs/afs/cmservice.c
@@ -118,7 +118,7 @@ static int kafscmd(void *arg)
         _SRXAFSCM_xxxx_t func;
         int die;
 
-        printk("kAFS: Started kafscmd %d\n", current->pid);
+        printk(KERN_INFO "kAFS: Started kafscmd %d\n", current->pid);
 
         daemonize("kafscmd");
 
diff --git a/fs/afs/dir.c b/fs/afs/dir.c
index 6682d6d7f294..5c61c24dab2a 100644
--- a/fs/afs/dir.c
+++ b/fs/afs/dir.c
@@ -137,7 +137,7 @@ static inline void afs_dir_check_page(struct inode *dir, struct page *page)
 #endif
 
         /* determine how many magic numbers there should be in this page */
-        latter = dir->i_size - (page->index << PAGE_CACHE_SHIFT);
+        latter = dir->i_size - page_offset(page);
         if (latter >= PAGE_SIZE)
                 qty = PAGE_SIZE;
         else
diff --git a/fs/afs/volume.h b/fs/afs/volume.h
index 1e691889c4c9..bfdcf19ba3f3 100644
--- a/fs/afs/volume.h
+++ b/fs/afs/volume.h
@@ -18,8 +18,6 @@
 #include "kafsasyncd.h"
 #include "cache.h"
 
-#define __packed __attribute__((packed))
-
 typedef enum {
         AFS_VLUPD_SLEEP,                /* sleeping waiting for update timer to fire */
         AFS_VLUPD_PENDING,              /* on pending queue */
@@ -115,7 +113,7 @@ struct afs_volume
         struct cachefs_cookie   *cache;         /* caching cookie */
 #endif
         afs_volid_t             vid;            /* volume ID */
-        afs_voltype_t __packed  type;           /* type of volume */
+        afs_voltype_t           type;           /* type of volume */
         char                    type_force;     /* force volume type (suppress R/O -> R/W) */
         unsigned short          nservers;       /* number of server slots filled */
         unsigned short          rjservers;      /* number of servers discarded due to -ENOMEDIUM */