Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / fs / afs / volume.h

diff --git a/fs/afs/volume.h b/fs/afs/volume.h
index bbe4634..bfdcf19 100644 (file)
--- 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 */
@@ -99,7 +97,6 @@ extern int afs_vlocation_lookup(struct afs_cell *cell,
 
 #define afs_get_vlocation(V) do { atomic_inc(&(V)->usage); } while(0)
 
-extern void __afs_put_vlocation(struct afs_vlocation *vlocation);
 extern void afs_put_vlocation(struct afs_vlocation *vlocation);
 extern void afs_vlocation_do_timeout(struct afs_vlocation *vlocation);
 
@@ -116,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 */