diff --git a/[refs] b/[refs] index 53686e4655e8..3f3a531a04fc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6a878184c202395ea17212f111ab9ec4b5f6d6ee +refs/heads/master: bfc090c468b33fb1f75c27a11efa7b7dc250556f diff --git a/trunk/fs/afs/volume.h b/trunk/fs/afs/volume.h index 1e691889c4c9..bfdcf19ba3f3 100644 --- a/trunk/fs/afs/volume.h +++ b/trunk/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 */