Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[safe/jmp/linux-2.6] / fs / ceph / auth.c

diff --git a/fs/ceph/auth.c b/fs/ceph/auth.c
index b34ce0e..818afe7 100644 (file)
--- a/fs/ceph/auth.c
+++ b/fs/ceph/auth.c
@@ -1,10 +1,13 @@
 #include "ceph_debug.h"
 
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <linux/err.h>
+#include <linux/slab.h>
 
 #include "types.h"
 #include "auth_none.h"
+#include "auth_x.h"
 #include "decode.h"
 #include "super.h"
 
@@ -14,7 +17,8 @@
  * get protocol handler
  */
 static u32 supported_protocols[] = {
-       CEPH_AUTH_NONE
+       CEPH_AUTH_NONE,
+       CEPH_AUTH_CEPHX
 };
 
 int ceph_auth_init_protocol(struct ceph_auth_client *ac, int protocol)
@@ -22,6 +26,8 @@ int ceph_auth_init_protocol(struct ceph_auth_client *ac, int protocol)
        switch (protocol) {
        case CEPH_AUTH_NONE:
                return ceph_auth_none_init(ac);
+       case CEPH_AUTH_CEPHX:
+               return ceph_x_init(ac);
        default:
                return -ENOENT;
        }