ext4: Fix return value of ext4_split_unwritten_extents() to fix direct I/O

[safe/jmp/linux-2.6] / fs / afs / main.c

diff --git a/fs/afs/main.c b/fs/afs/main.c
index 0cf1b02..66d54d3 100644 (file)
--- a/fs/afs/main.c
+++ b/fs/afs/main.c
@@ -1,6 +1,6 @@
 /* AFS client file system
  *
- * Copyright (C) 2002 Red Hat, Inc. All Rights Reserved.
+ * Copyright (C) 2002,5 Red Hat, Inc. All Rights Reserved.
  * Written by David Howells (dhowells@redhat.com)
  *
  * This program is free software; you can redistribute it and/or
@@ -13,6 +13,7 @@
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/completion.h>
+#include <linux/sched.h>
 #include "internal.h"
 
 MODULE_DESCRIPTION("AFS Client File System");
@@ -21,24 +22,57 @@ MODULE_LICENSE("GPL");
 
 unsigned afs_debug;
 module_param_named(debug, afs_debug, uint, S_IWUSR | S_IRUGO);
-MODULE_PARM_DESC(afs_debug, "AFS debugging mask");
+MODULE_PARM_DESC(debug, "AFS debugging mask");
 
 static char *rootcell;
 
 module_param(rootcell, charp, 0);
 MODULE_PARM_DESC(rootcell, "root AFS cell name and VL server IP addr list");
 
-#ifdef AFS_CACHING_SUPPORT
-static struct cachefs_netfs_operations afs_cache_ops = {
-       .get_page_cookie        = afs_cache_get_page_cookie,
-};
+struct afs_uuid afs_uuid;
 
-struct cachefs_netfs afs_cache_netfs = {
-       .name                   = "afs",
-       .version                = 0,
-       .ops                    = &afs_cache_ops,
-};
-#endif
+/*
+ * get a client UUID
+ */
+static int __init afs_get_client_UUID(void)
+{
+       struct timespec ts;
+       u64 uuidtime;
+       u16 clockseq;
+       int ret;
+
+       /* read the MAC address of one of the external interfaces and construct
+        * a UUID from it */
+       ret = afs_get_MAC_address(afs_uuid.node, sizeof(afs_uuid.node));
+       if (ret < 0)
+               return ret;
+
+       getnstimeofday(&ts);
+       uuidtime = (u64) ts.tv_sec * 1000 * 1000 * 10;
+       uuidtime += ts.tv_nsec / 100;
+       uuidtime += AFS_UUID_TO_UNIX_TIME;
+       afs_uuid.time_low = uuidtime;
+       afs_uuid.time_mid = uuidtime >> 32;
+       afs_uuid.time_hi_and_version = (uuidtime >> 48) & AFS_UUID_TIMEHI_MASK;
+       afs_uuid.time_hi_and_version = AFS_UUID_VERSION_TIME;
+
+       get_random_bytes(&clockseq, 2);
+       afs_uuid.clock_seq_low = clockseq;
+       afs_uuid.clock_seq_hi_and_reserved =
+               (clockseq >> 8) & AFS_UUID_CLOCKHI_MASK;
+       afs_uuid.clock_seq_hi_and_reserved = AFS_UUID_VARIANT_STD;
+
+       _debug("AFS UUID: %08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+              afs_uuid.time_low,
+              afs_uuid.time_mid,
+              afs_uuid.time_hi_and_version,
+              afs_uuid.clock_seq_hi_and_reserved,
+              afs_uuid.clock_seq_low,
+              afs_uuid.node[0], afs_uuid.node[1], afs_uuid.node[2],
+              afs_uuid.node[3], afs_uuid.node[4], afs_uuid.node[5]);
+
+       return 0;
+}
 
 /*
  * initialise the AFS client FS module
@@ -49,15 +83,18 @@ static int __init afs_init(void)
 
        printk(KERN_INFO "kAFS: Red Hat AFS client v0.1 registering.\n");
 
+       ret = afs_get_client_UUID();
+       if (ret < 0)
+               return ret;
+
        /* register the /proc stuff */
        ret = afs_proc_init();
        if (ret < 0)
                return ret;
 
-#ifdef AFS_CACHING_SUPPORT
+#ifdef CONFIG_AFS_FSCACHE
        /* we want to be able to cache */
-       ret = cachefs_register_netfs(&afs_cache_netfs,
-                                    &afs_cache_cell_index_def);
+       ret = fscache_register_netfs(&afs_cache_netfs);
        if (ret < 0)
                goto error_cache;
 #endif
@@ -92,14 +129,15 @@ error_fs:
 error_open_socket:
 error_vl_update_init:
 error_cell_init:
-#ifdef AFS_CACHING_SUPPORT
-       cachefs_unregister_netfs(&afs_cache_netfs);
+#ifdef CONFIG_AFS_FSCACHE
+       fscache_unregister_netfs(&afs_cache_netfs);
 error_cache:
 #endif
        afs_callback_update_kill();
        afs_vlocation_purge();
        afs_cell_purge();
        afs_proc_cleanup();
+       rcu_barrier();
        printk(KERN_ERR "kAFS: failed to register: %d\n", ret);
        return ret;
 }
@@ -117,16 +155,18 @@ static void __exit afs_exit(void)
        printk(KERN_INFO "kAFS: Red Hat AFS client v0.1 unregistering.\n");
 
        afs_fs_exit();
+       afs_kill_lock_manager();
        afs_close_socket();
        afs_purge_servers();
        afs_callback_update_kill();
        afs_vlocation_purge();
        flush_scheduled_work();
        afs_cell_purge();
-#ifdef AFS_CACHING_SUPPORT
-       cachefs_unregister_netfs(&afs_cache_netfs);
+#ifdef CONFIG_AFS_FSCACHE
+       fscache_unregister_netfs(&afs_cache_netfs);
 #endif
        afs_proc_cleanup();
+       rcu_barrier();
 }
 
 module_exit(afs_exit);