LU-14475 log: Rewrite some log messages

[fs/lustre-release.git] / lustre / ptlrpc / gss / gss_rawobj.c

diff --git a/lustre/ptlrpc/gss/gss_rawobj.c b/lustre/ptlrpc/gss/gss_rawobj.c
index 7a20a3a..1400414 100644 (file)
--- a/lustre/ptlrpc/gss/gss_rawobj.c
+++ b/lustre/ptlrpc/gss/gss_rawobj.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -16,31 +14,25 @@
  * in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see [sun.com URL with a
- * copy of GPLv2].
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * version 2 along with this program; If not, see
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  *
  * lustre/ptlrpc/gss/gss_rawobj.c
  *
  * Author: Eric Mei <ericm@clusterfs.com>
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
 #define DEBUG_SUBSYSTEM S_SEC
 
 #include <linux/mutex.h>
@@ -65,7 +57,7 @@ int rawobj_alloc(rawobj_t *obj, char *buf, int len)
 
         obj->len = len;
         if (len) {
-                OBD_ALLOC(obj->data, len);
+                OBD_ALLOC_LARGE(obj->data, len);
                 if (!obj->data) {
                         obj->len = 0;
                         RETURN(-ENOMEM);
@@ -82,7 +74,7 @@ void rawobj_free(rawobj_t *obj)
 
         if (obj->len) {
                 LASSERT(obj->data);
-                OBD_FREE(obj->data, obj->len);
+                OBD_FREE_LARGE(obj->data, obj->len);
                 obj->len = 0;
                 obj->data = NULL;
         } else
@@ -103,7 +95,7 @@ int rawobj_dup(rawobj_t *dest, rawobj_t *src)
 
         dest->len = src->len;
         if (dest->len) {
-                OBD_ALLOC(dest->data, dest->len);
+                OBD_ALLOC_LARGE(dest->data, dest->len);
                 if (!dest->data) {
                         dest->len = 0;
                         return -ENOMEM;
@@ -122,10 +114,11 @@ int rawobj_serialize(rawobj_t *obj, __u32 **buf, __u32 *buflen)
         LASSERT(buf);
         LASSERT(buflen);
 
-        len = size_round4(obj->len);
+        len = cfs_size_round4(obj->len);
 
         if (*buflen < 4 + len) {
-                CERROR("buflen %u <  %u\n", *buflen, 4 + len);
+                CERROR("shorter buflen than needed: %u < %u\n",
+                        *buflen, 4 + len);
                 return -EINVAL;
         }
 
@@ -143,7 +136,7 @@ static int __rawobj_extract(rawobj_t *obj, __u32 **buf, __u32 *buflen,
         __u32 len;
 
         if (*buflen < sizeof(__u32)) {
-                CERROR("buflen %u\n", *buflen);
+                CERROR("too short buflen: %u\n", *buflen);
                 return -EINVAL;
         }
 
@@ -157,9 +150,10 @@ static int __rawobj_extract(rawobj_t *obj, __u32 **buf, __u32 *buflen,
                 return 0;
         }
 
-        len = local ? obj->len : size_round4(obj->len);
+        len = local ? obj->len : cfs_size_round4(obj->len);
         if (*buflen < len) {
-                CERROR("buflen %u < %u\n", *buflen, len);
+                CERROR("shorter buflen than object size: %u < %u\n",
+                        *buflen, len);
                 obj->len = 0;
                 return -EINVAL;
         }
@@ -167,7 +161,7 @@ static int __rawobj_extract(rawobj_t *obj, __u32 **buf, __u32 *buflen,
         if (!alloc)
                 obj->data = (__u8 *) *buf;
         else {
-                OBD_ALLOC(obj->data, obj->len);
+                OBD_ALLOC_LARGE(obj->data, obj->len);
                 if (!obj->data) {
                         CERROR("fail to alloc %u bytes\n", obj->len);
                         obj->len = 0;
@@ -216,8 +210,8 @@ int rawobj_from_netobj_alloc(rawobj_t *rawobj, netobj_t *netobj)
 
         if (netobj->len == 0)
                 return 0;
-                
-        OBD_ALLOC(rawobj->data, netobj->len);
+
+        OBD_ALLOC_LARGE(rawobj->data, netobj->len);
         if (rawobj->data == NULL)
                 return -ENOMEM;
 
@@ -234,7 +228,8 @@ int buffer_extract_bytes(const void **buf, __u32 *buflen,
                          void *res, __u32 reslen)
 {
         if (*buflen < reslen) {
-                CERROR("buflen %u < %u\n", *buflen, reslen);
+                CERROR("shorter buflen than expected: %u < %u\n",
+                        *buflen, reslen);
                 return -EINVAL;
         }