Branch HEAD

[fs/lustre-release.git] / lustre / sec / sec_null.c

diff --git a/lustre/sec/sec_null.c b/lustre/sec/sec_null.c
index 3d9d908..4eec3ac 100644 (file)
--- a/lustre/sec/sec_null.c
+++ b/lustre/sec/sec_null.c
@@ -38,28 +38,23 @@
 
 static int null_cred_refresh(struct ptlrpc_cred *cred)
 {
-        ENTRY;
-        LASSERT(cred->pc_flags & PTLRPC_CRED_UPTODATE);
-        RETURN(0);
+        LASSERT(test_bit(PTLRPC_CRED_UPTODATE_BIT, &cred->pc_flags));
+        return 0;
 }
 
 static int null_cred_match(struct ptlrpc_cred *cred,
-                           struct ptlrpc_request *req,
                            struct vfs_cred *vcred)
 {
-        ENTRY;
-        RETURN(1);
+        return 1;
 }
 
 static int null_cred_sign(struct ptlrpc_cred *cred,
                           struct ptlrpc_request *req)
 {
         struct ptlrpcs_wire_hdr *hdr = buf_to_sec_hdr(req->rq_reqbuf);
-        ENTRY;
 
         hdr->sec_len = cpu_to_le32(0);
-
-        RETURN(0);
+        return 0;
 }
 
 static int null_cred_verify(struct ptlrpc_cred *cred,
@@ -69,7 +64,7 @@ static int null_cred_verify(struct ptlrpc_cred *cred,
 
         if (hdr->sec_len != 0) {
                 CERROR("security payload %u not zero\n", hdr->sec_len);
-                RETURN(-EPROTO);
+                return -EPROTO;
         }
 
         req->rq_repmsg = (struct lustre_msg *)(hdr + 1);
@@ -77,14 +72,14 @@ static int null_cred_verify(struct ptlrpc_cred *cred,
         CDEBUG(D_SEC, "set repmsg at %p, len %d\n",
                req->rq_repmsg, req->rq_replen);
 
-        RETURN(0);
+        return 0;
 }
 
 static void null_cred_destroy(struct ptlrpc_cred *cred)
 {
         LASSERT(!atomic_read(&cred->pc_refcount));
 
-        CDEBUG(D_SEC, "NULL_SEC: destroy cred %p\n", cred);
+        CDEBUG(D_SEC, "sec.null %p: destroy cred %p\n", cred->pc_sec, cred);
         OBD_FREE(cred, sizeof(*cred));
 }
 
@@ -97,25 +92,24 @@ static struct ptlrpc_credops null_credops = {
 };
 
 static
-struct ptlrpc_sec* null_create_sec(ptlrpcs_flavor_t *flavor,
+struct ptlrpc_sec* null_create_sec(__u32 flavor,
                                    const char *pipe_dir,
                                    void *pipe_data)
 {
         struct ptlrpc_sec *sec;
         ENTRY;
 
-        LASSERT(flavor->flavor == PTLRPC_SEC_NULL);
+        LASSERT(SEC_FLAVOR_MAJOR(flavor) == PTLRPCS_FLVR_MAJOR_NULL);
 
         OBD_ALLOC(sec, sizeof(*sec));
         if (!sec)
                 RETURN(ERR_PTR(-ENOMEM));
 
-        sec->ps_sectype = PTLRPC_SEC_TYPE_NONE;
-        sec->ps_expire = (-1UL >> 1); /* never expire */
-        sec->ps_nextgc = (-1UL >> 1);
+        sec->ps_expire = 0; /* never expire */
+        sec->ps_nextgc = 0; /* never do gc */
         sec->ps_flags = 0;
 
-        CDEBUG(D_SEC, "Create NULL security module at %p\n", sec);
+        CDEBUG(D_SEC, "Create sec.null module at %p\n", sec);
         RETURN(sec);
 }
 
@@ -124,7 +118,7 @@ void null_destroy_sec(struct ptlrpc_sec *sec)
 {
         ENTRY;
 
-        CDEBUG(D_SEC, "Destroy NULL security module at %p\n", sec);
+        CDEBUG(D_SEC, "Destroy sec.null %p\n", sec);
 
         LASSERT(!atomic_read(&sec->ps_refcount));
         OBD_FREE(sec, sizeof(*sec));
@@ -133,7 +127,6 @@ void null_destroy_sec(struct ptlrpc_sec *sec)
 
 static
 struct ptlrpc_cred* null_create_cred(struct ptlrpc_sec *sec,
-                                     struct ptlrpc_request *req,
                                      struct vfs_cred *vcred)
 {
         struct ptlrpc_cred *cred;
@@ -147,8 +140,7 @@ struct ptlrpc_cred* null_create_cred(struct ptlrpc_sec *sec,
         atomic_set(&cred->pc_refcount, 0);
         cred->pc_sec = sec;
         cred->pc_ops = &null_credops;
-        cred->pc_req = req;
-        cred->pc_expire = (-1UL >> 1); /* never expire */
+        cred->pc_expire = 0;
         cred->pc_flags = PTLRPC_CRED_UPTODATE;
         cred->pc_pag = vcred->vc_pag;
         cred->pc_uid = vcred->vc_uid;
@@ -166,9 +158,9 @@ static struct ptlrpc_secops null_secops = {
 
 static struct ptlrpc_sec_type null_type = {
         .pst_owner      = THIS_MODULE,
-        .pst_name       = "NULL_SEC",
+        .pst_name       = "sec.null",
         .pst_inst       = ATOMIC_INIT(0),
-        .pst_flavor     = {PTLRPC_SEC_NULL, 0},
+        .pst_flavor     = PTLRPCS_FLVR_MAJOR_NULL,
         .pst_ops        = &null_secops,
 };
 
@@ -178,7 +170,7 @@ int ptlrpcs_null_init(void)
 
         rc = ptlrpcs_register(&null_type);
         if (rc)
-                CERROR("failed to register NULL security: %d\n", rc);
+                CERROR("failed to register sec.null: %d\n", rc);
 
         return rc;
 }
@@ -189,7 +181,7 @@ int ptlrpcs_null_exit(void)
 
         rc = ptlrpcs_unregister(&null_type);
         if (rc)
-                CERROR("cannot unregister NULL security: %d\n", rc);
+                CERROR("cannot unregister sec.null: %d\n", rc);
 
         return rc;
 }