Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-1302 llog: pass lu_env as parametr in llog functions
[fs/lustre-release.git]
/
lustre
/
ptlrpc
/
sec_null.c
diff --git
a/lustre/ptlrpc/sec_null.c
b/lustre/ptlrpc/sec_null.c
index
52100ae
..
f884574
100644
(file)
--- a/
lustre/ptlrpc/sec_null.c
+++ b/
lustre/ptlrpc/sec_null.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.
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@
-26,8
+24,10
@@
* GPL HEADER END
*/
/*
* 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.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2011, Whamcloud, Inc.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-38,9
+38,6
@@
* Author: Eric Mei <ericm@clusterfs.com>
*/
* Author: Eric Mei <ericm@clusterfs.com>
*/
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
#define DEBUG_SUBSYSTEM S_SEC
#ifndef __KERNEL__
#define DEBUG_SUBSYSTEM S_SEC
#ifndef __KERNEL__
@@
-107,7
+104,7
@@
int null_ctx_verify(struct ptlrpc_cli_ctx *ctx, struct ptlrpc_request *req)
if (req->rq_early) {
cksums = lustre_msg_get_cksum(req->rq_repdata);
if (req->rq_early) {
cksums = lustre_msg_get_cksum(req->rq_repdata);
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2,
9,
0, 0)
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2,
7, 5
0, 0)
if (lustre_msghdr_get_flags(req->rq_reqmsg) &
MSGHDR_CKSUM_INCOMPAT18)
cksumc = lustre_msg_calc_cksum(req->rq_repmsg, 0);
if (lustre_msghdr_get_flags(req->rq_reqmsg) &
MSGHDR_CKSUM_INCOMPAT18)
cksumc = lustre_msg_calc_cksum(req->rq_repmsg, 0);
@@
-118,8
+115,9
@@
int null_ctx_verify(struct ptlrpc_cli_ctx *ctx, struct ptlrpc_request *req)
cksumc = lustre_msg_calc_cksum(req->rq_repmsg);
#endif
if (cksumc != cksums) {
cksumc = lustre_msg_calc_cksum(req->rq_repmsg);
#endif
if (cksumc != cksums) {
- CWARN("early reply checksum mismatch: %08x != %08x\n",
- cksumc, cksums);
+ CDEBUG(D_SEC,
+ "early reply checksum mismatch: %08x != %08x\n",
+ cksumc, cksums);
return -EINVAL;
}
}
return -EINVAL;
}
}
@@
-173,7
+171,7
@@
int null_alloc_reqbuf(struct ptlrpc_sec *sec,
int alloc_size = size_roundup_power2(msgsize);
LASSERT(!req->rq_pool);
int alloc_size = size_roundup_power2(msgsize);
LASSERT(!req->rq_pool);
- OBD_ALLOC(req->rq_reqbuf, alloc_size);
+ OBD_ALLOC
_LARGE
(req->rq_reqbuf, alloc_size);
if (!req->rq_reqbuf)
return -ENOMEM;
if (!req->rq_reqbuf)
return -ENOMEM;
@@
-200,12
+198,10
@@
void null_free_reqbuf(struct ptlrpc_sec *sec,
"req %p: reqlen %d should smaller than buflen %d\n",
req, req->rq_reqlen, req->rq_reqbuf_len);
"req %p: reqlen %d should smaller than buflen %d\n",
req, req->rq_reqlen, req->rq_reqbuf_len);
- OBD_FREE(req->rq_reqbuf, req->rq_reqbuf_len);
- req->rq_req
msg = req->rq_req
buf = NULL;
+ OBD_FREE
_LARGE
(req->rq_reqbuf, req->rq_reqbuf_len);
+ req->rq_reqbuf = NULL;
req->rq_reqbuf_len = 0;
}
req->rq_reqbuf_len = 0;
}
-
- req->rq_reqmsg = NULL;
}
static
}
static
@@
-218,7
+214,7
@@
int null_alloc_repbuf(struct ptlrpc_sec *sec,
msgsize = size_roundup_power2(msgsize);
msgsize = size_roundup_power2(msgsize);
- OBD_ALLOC(req->rq_repbuf, msgsize);
+ OBD_ALLOC
_LARGE
(req->rq_repbuf, msgsize);
if (!req->rq_repbuf)
return -ENOMEM;
if (!req->rq_repbuf)
return -ENOMEM;
@@
-232,11
+228,9
@@
void null_free_repbuf(struct ptlrpc_sec *sec,
{
LASSERT(req->rq_repbuf);
{
LASSERT(req->rq_repbuf);
- OBD_FREE(req->rq_repbuf, req->rq_repbuf_len);
+ OBD_FREE
_LARGE
(req->rq_repbuf, req->rq_repbuf_len);
req->rq_repbuf = NULL;
req->rq_repbuf_len = 0;
req->rq_repbuf = NULL;
req->rq_repbuf_len = 0;
-
- req->rq_repmsg = NULL;
}
static
}
static
@@
-265,13
+259,13
@@
int null_enlarge_reqbuf(struct ptlrpc_sec *sec,
if (req->rq_reqbuf_len < newmsg_size) {
alloc_size = size_roundup_power2(newmsg_size);
if (req->rq_reqbuf_len < newmsg_size) {
alloc_size = size_roundup_power2(newmsg_size);
- OBD_ALLOC(newbuf, alloc_size);
+ OBD_ALLOC
_LARGE
(newbuf, alloc_size);
if (newbuf == NULL)
return -ENOMEM;
memcpy(newbuf, req->rq_reqbuf, req->rq_reqlen);
if (newbuf == NULL)
return -ENOMEM;
memcpy(newbuf, req->rq_reqbuf, req->rq_reqlen);
- OBD_FREE(req->rq_reqbuf, req->rq_reqbuf_len);
+ OBD_FREE
_LARGE
(req->rq_reqbuf, req->rq_reqbuf_len);
req->rq_reqbuf = req->rq_reqmsg = newbuf;
req->rq_reqbuf_len = alloc_size;
}
req->rq_reqbuf = req->rq_reqmsg = newbuf;
req->rq_reqbuf_len = alloc_size;
}
@@
-323,7
+317,7
@@
int null_alloc_rs(struct ptlrpc_request *req, int msgsize)
/* pre-allocated */
LASSERT(rs->rs_size >= rs_size);
} else {
/* pre-allocated */
LASSERT(rs->rs_size >= rs_size);
} else {
- OBD_ALLOC(rs, rs_size);
+ OBD_ALLOC
_LARGE
(rs, rs_size);
if (rs == NULL)
return -ENOMEM;
if (rs == NULL)
return -ENOMEM;
@@
-344,11
+338,11
@@
int null_alloc_rs(struct ptlrpc_request *req, int msgsize)
static
void null_free_rs(struct ptlrpc_reply_state *rs)
{
static
void null_free_rs(struct ptlrpc_reply_state *rs)
{
- LASSERT
(cfs_atomic_read(&rs->rs_svc_ctx->sc_refcount) >
1);
+ LASSERT
_ATOMIC_GT(&rs->rs_svc_ctx->sc_refcount,
1);
cfs_atomic_dec(&rs->rs_svc_ctx->sc_refcount);
if (!rs->rs_prealloc)
cfs_atomic_dec(&rs->rs_svc_ctx->sc_refcount);
if (!rs->rs_prealloc)
- OBD_FREE(rs, rs->rs_size);
+ OBD_FREE
_LARGE
(rs, rs->rs_size);
}
static
}
static
@@
-369,7
+363,7
@@
int null_authorize(struct ptlrpc_request *req)
} else {
__u32 cksum;
} else {
__u32 cksum;
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2,
9,
0, 0)
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2,
7, 5
0, 0)
if (lustre_msghdr_get_flags(req->rq_reqmsg) &
MSGHDR_CKSUM_INCOMPAT18)
cksum = lustre_msg_calc_cksum(rs->rs_repbuf, 0);
if (lustre_msghdr_get_flags(req->rq_reqmsg) &
MSGHDR_CKSUM_INCOMPAT18)
cksum = lustre_msg_calc_cksum(rs->rs_repbuf, 0);