Merge branches 'armv7', 'at91', 'misc' and 'omap' into devel

[linux-2.6] / fs / afs / internal.h

diff --git a/fs/afs/internal.h b/fs/afs/internal.h
index 73bfa0b2d99e3f819944338e620c5feb793059ad..d90c158cd9346d46c0abbb9dd01dcacf6b1c30f2 100644 (file)
--- a/fs/afs/internal.h
+++ b/fs/afs/internal.h
@@ -219,7 +219,7 @@ struct afs_vlocation {
        struct afs_volume       *vols[3];       /* volume access record pointer (index by type) */
        wait_queue_head_t       waitq;          /* status change waitqueue */
        time_t                  update_at;      /* time at which record should be updated */
-       rwlock_t                lock;           /* access lock */
+       spinlock_t              lock;           /* access lock */
        afs_vlocation_state_t   state;          /* volume location state */
        unsigned short          upd_rej_cnt;    /* ENOMEDIUM count during update */
        unsigned short          upd_busy_cnt;   /* EBUSY count during update */
@@ -349,7 +349,6 @@ struct afs_permits {
  * record of one of a system's set of network interfaces
  */
 struct afs_interface {
-       unsigned        index;          /* interface index */
        struct in_addr  address;        /* IPv4 address bound to interface */
        struct in_addr  netmask;        /* netmask applied to address */
        unsigned        mtu;            /* MTU of interface */
@@ -367,7 +366,7 @@ struct afs_uuid {
        u32             time_low;                       /* low part of timestamp */
        u16             time_mid;                       /* mid part of timestamp */
        u16             time_hi_and_version;            /* high part of timestamp and version  */
-#define AFS_UUID_TO_UNIX_TIME  0x01b21dd213814000
+#define AFS_UUID_TO_UNIX_TIME  0x01b21dd213814000ULL
 #define AFS_UUID_TIMEHI_MASK   0x0fff
 #define AFS_UUID_VERSION_TIME  0x1000  /* time-based UUID */
 #define AFS_UUID_VERSION_NAME  0x3000  /* name-based UUID */
@@ -392,7 +391,7 @@ extern void afs_give_up_callback(struct afs_vnode *);
 extern void afs_dispatch_give_up_callbacks(struct work_struct *);
 extern void afs_flush_callback_breaks(struct afs_server *);
 extern int __init afs_callback_update_init(void);
-extern void __exit afs_callback_update_kill(void);
+extern void afs_callback_update_kill(void);
 
 /*
  * cell.c
@@ -564,7 +563,7 @@ extern void afs_fs_exit(void);
  * use-rtnetlink.c
  */
 extern int afs_get_ipv4_interfaces(struct afs_interface *, size_t, bool);
-extern int afs_get_MAC_address(u8 [6]);
+extern int afs_get_MAC_address(u8 *, size_t);
 
 /*
  * vlclient.c
@@ -591,7 +590,7 @@ extern struct afs_vlocation *afs_vlocation_lookup(struct afs_cell *,
                                                  struct key *,
                                                  const char *, size_t);
 extern void afs_put_vlocation(struct afs_vlocation *);
-extern void __exit afs_vlocation_purge(void);
+extern void afs_vlocation_purge(void);
 
 /*
  * vnode.c