[CIFS] cifs: Rename cERROR and cFYI to cifs_dbg

[deliverable/linux.git] / fs / cifs / asn1.c

diff --git a/fs/cifs/asn1.c b/fs/cifs/asn1.c
index 1d36db114772b953065555cd7e80aa5abca36a7d..a3b56544c21b96599fa97f0df02a5fd2c6317678 100644 (file)
--- a/fs/cifs/asn1.c
+++ b/fs/cifs/asn1.c
@@ -506,11 +506,11 @@ decode_negTokenInit(unsigned char *security_blob, int length,
 
        /* GSSAPI header */
        if (asn1_header_decode(&ctx, &end, &cls, &con, &tag) == 0) {
-               cFYI(1, "Error decoding negTokenInit header");
+               cifs_dbg(FYI, "Error decoding negTokenInit header\n");
                return 0;
        } else if ((cls != ASN1_APL) || (con != ASN1_CON)
                   || (tag != ASN1_EOC)) {
-               cFYI(1, "cls = %d con = %d tag = %d", cls, con, tag);
+               cifs_dbg(FYI, "cls = %d con = %d tag = %d\n", cls, con, tag);
                return 0;
        }
 
@@ -531,52 +531,52 @@ decode_negTokenInit(unsigned char *security_blob, int length,
 
        /* SPNEGO OID not present or garbled -- bail out */
        if (!rc) {
-               cFYI(1, "Error decoding negTokenInit header");
+               cifs_dbg(FYI, "Error decoding negTokenInit header\n");
                return 0;
        }
 
        /* SPNEGO */
        if (asn1_header_decode(&ctx, &end, &cls, &con, &tag) == 0) {
-               cFYI(1, "Error decoding negTokenInit");
+               cifs_dbg(FYI, "Error decoding negTokenInit\n");
                return 0;
        } else if ((cls != ASN1_CTX) || (con != ASN1_CON)
                   || (tag != ASN1_EOC)) {
-               cFYI(1, "cls = %d con = %d tag = %d end = %p (%d) exit 0",
-                    cls, con, tag, end, *end);
+               cifs_dbg(FYI, "cls = %d con = %d tag = %d end = %p (%d) exit 0\n",
+                        cls, con, tag, end, *end);
                return 0;
        }
 
        /* negTokenInit */
        if (asn1_header_decode(&ctx, &end, &cls, &con, &tag) == 0) {
-               cFYI(1, "Error decoding negTokenInit");
+               cifs_dbg(FYI, "Error decoding negTokenInit\n");
                return 0;
        } else if ((cls != ASN1_UNI) || (con != ASN1_CON)
                   || (tag != ASN1_SEQ)) {
-               cFYI(1, "cls = %d con = %d tag = %d end = %p (%d) exit 1",
-                    cls, con, tag, end, *end);
+               cifs_dbg(FYI, "cls = %d con = %d tag = %d end = %p (%d) exit 1\n",
+                        cls, con, tag, end, *end);
                return 0;
        }
 
        /* sequence */
        if (asn1_header_decode(&ctx, &end, &cls, &con, &tag) == 0) {
-               cFYI(1, "Error decoding 2nd part of negTokenInit");
+               cifs_dbg(FYI, "Error decoding 2nd part of negTokenInit\n");
                return 0;
        } else if ((cls != ASN1_CTX) || (con != ASN1_CON)
                   || (tag != ASN1_EOC)) {
-               cFYI(1, "cls = %d con = %d tag = %d end = %p (%d) exit 0",
-                    cls, con, tag, end, *end);
+               cifs_dbg(FYI, "cls = %d con = %d tag = %d end = %p (%d) exit 0\n",
+                        cls, con, tag, end, *end);
                return 0;
        }
 
        /* sequence of */
        if (asn1_header_decode
            (&ctx, &sequence_end, &cls, &con, &tag) == 0) {
-               cFYI(1, "Error decoding 2nd part of negTokenInit");
+               cifs_dbg(FYI, "Error decoding 2nd part of negTokenInit\n");
                return 0;
        } else if ((cls != ASN1_UNI) || (con != ASN1_CON)
                   || (tag != ASN1_SEQ)) {
-               cFYI(1, "cls = %d con = %d tag = %d end = %p (%d) exit 1",
-                    cls, con, tag, end, *end);
+               cifs_dbg(FYI, "cls = %d con = %d tag = %d end = %p (%d) exit 1\n",
+                        cls, con, tag, end, *end);
                return 0;
        }
 
@@ -584,15 +584,15 @@ decode_negTokenInit(unsigned char *security_blob, int length,
        while (!asn1_eoc_decode(&ctx, sequence_end)) {
                rc = asn1_header_decode(&ctx, &end, &cls, &con, &tag);
                if (!rc) {
-                       cFYI(1, "Error decoding negTokenInit hdr exit2");
+                       cifs_dbg(FYI, "Error decoding negTokenInit hdr exit2\n");
                        return 0;
                }
                if ((tag == ASN1_OJI) && (con == ASN1_PRI)) {
                        if (asn1_oid_decode(&ctx, end, &oid, &oidlen)) {
 
-                               cFYI(1, "OID len = %d oid = 0x%lx 0x%lx "
-                                       "0x%lx 0x%lx", oidlen, *oid,
-                                       *(oid + 1), *(oid + 2), *(oid + 3));
+                               cifs_dbg(FYI, "OID len = %d oid = 0x%lx 0x%lx 0x%lx 0x%lx\n",
+                                        oidlen, *oid, *(oid + 1), *(oid + 2),
+                                        *(oid + 3));
 
                                if (compare_oid(oid, oidlen, MSKRB5_OID,
                                                MSKRB5_OID_LEN))
@@ -610,7 +610,7 @@ decode_negTokenInit(unsigned char *security_blob, int length,
                                kfree(oid);
                        }
                } else {
-                       cFYI(1, "Should be an oid what is going on?");
+                       cifs_dbg(FYI, "Should be an oid what is going on?\n");
                }
        }