Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / fs / afs / cmservice.c

diff --git a/fs/afs/cmservice.c b/fs/afs/cmservice.c
index 289489d..f87d5a7 100644 (file)
--- a/fs/afs/cmservice.c
+++ b/fs/afs/cmservice.c
@@ -24,7 +24,7 @@
 #include "internal.h"
 
 static unsigned afscm_usage;           /* AFS cache manager usage count */
-static struct rw_semaphore afscm_sem;  /* AFS cache manager start/stop semaphore */
+static DECLARE_RWSEM(afscm_sem);       /* AFS cache manager start/stop semaphore */
 
 static int afscm_new_call(struct rxrpc_call *call);
 static void afscm_attention(struct rxrpc_call *call);
@@ -94,7 +94,7 @@ static struct rxrpc_service AFSCM_service = {
        .error_func     = afscm_error,
        .aemap_func     = afscm_aemap,
        .ops_begin      = &AFSCM_ops[0],
-       .ops_end        = &AFSCM_ops[sizeof(AFSCM_ops) / sizeof(AFSCM_ops[0])],
+       .ops_end        = &AFSCM_ops[ARRAY_SIZE(AFSCM_ops)],
 };
 
 static DECLARE_COMPLETION(kafscmd_alive);
@@ -102,8 +102,8 @@ static DECLARE_COMPLETION(kafscmd_dead);
 static DECLARE_WAIT_QUEUE_HEAD(kafscmd_sleepq);
 static LIST_HEAD(kafscmd_attention_list);
 static LIST_HEAD(afscm_calls);
-static spinlock_t afscm_calls_lock = SPIN_LOCK_UNLOCKED;
-static spinlock_t kafscmd_attention_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(afscm_calls_lock);
+static DEFINE_SPINLOCK(kafscmd_attention_lock);
 static int kafscmd_die;
 
 /*****************************************************************************/
@@ -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");
 
@@ -307,10 +307,8 @@ int afscm_start(void)
                if (ret < 0)
                        goto kill;
 
-#ifdef AFS_AUTOMOUNT_SUPPORT
                afs_kafstimod_add_timer(&afs_mntpt_expiry_timer,
                                        afs_mntpt_expiry_timeout * HZ);
-#endif
        }
 
        afscm_usage++;
@@ -392,9 +390,7 @@ void afscm_stop(void)
                }
                spin_unlock(&kafscmd_attention_lock);
 
-#ifdef AFS_AUTOMOUNT_SUPPORT
                afs_kafstimod_del_timer(&afs_mntpt_expiry_timer);
-#endif
        }
 
        up_write(&afscm_sem);
@@ -428,7 +424,7 @@ static void _SRXAFSCM_CallBack(struct rxrpc_call *call)
                {
                        struct afs_callback *cb, *pcb;
                        int loop;
-                       u32 *fp, *bp;
+                       __be32 *fp, *bp;
 
                        fp = rxrpc_call_alloc_scratch(call, qty);