projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
[powerpc.git]
/
net
/
sunrpc
/
auth_null.c
diff --git
a/net/sunrpc/auth_null.c
b/net/sunrpc/auth_null.c
index
2eccffa
..
537d0e8
100644
(file)
--- a/
net/sunrpc/auth_null.c
+++ b/
net/sunrpc/auth_null.c
@@
-10,7
+10,6
@@
#include <linux/module.h>
#include <linux/utsname.h>
#include <linux/sunrpc/clnt.h>
#include <linux/module.h>
#include <linux/utsname.h>
#include <linux/sunrpc/clnt.h>
-#include <linux/sched.h>
#ifdef RPC_DEBUG
# define RPCDBG_FACILITY RPCDBG_AUTH
#ifdef RPC_DEBUG
# define RPCDBG_FACILITY RPCDBG_AUTH
@@
-60,8
+59,8
@@
nul_match(struct auth_cred *acred, struct rpc_cred *cred, int taskflags)
/*
* Marshal credential.
*/
/*
* Marshal credential.
*/
-static
u
32 *
-nul_marshal(struct rpc_task *task,
u
32 *p)
+static
__be
32 *
+nul_marshal(struct rpc_task *task,
__be
32 *p)
{
*p++ = htonl(RPC_AUTH_NULL);
*p++ = 0;
{
*p++ = htonl(RPC_AUTH_NULL);
*p++ = 0;
@@
-77,12
+76,12
@@
nul_marshal(struct rpc_task *task, u32 *p)
static int
nul_refresh(struct rpc_task *task)
{
static int
nul_refresh(struct rpc_task *task)
{
-
task->tk_msg.rpc_cred->cr_flags |= RPCAUTH_CRED_UPTODATE
;
+
set_bit(RPCAUTH_CRED_UPTODATE, &task->tk_msg.rpc_cred->cr_flags)
;
return 0;
}
return 0;
}
-static
u
32 *
-nul_validate(struct rpc_task *task,
u
32 *p)
+static
__be
32 *
+nul_validate(struct rpc_task *task,
__be
32 *p)
{
rpc_authflavor_t flavor;
u32 size;
{
rpc_authflavor_t flavor;
u32 size;
@@
-102,7
+101,7
@@
nul_validate(struct rpc_task *task, u32 *p)
return p;
}
return p;
}
-struct rpc_authops authnull_ops = {
+
const
struct rpc_authops authnull_ops = {
.owner = THIS_MODULE,
.au_flavor = RPC_AUTH_NULL,
#ifdef RPC_DEBUG
.owner = THIS_MODULE,
.au_flavor = RPC_AUTH_NULL,
#ifdef RPC_DEBUG
@@
-123,7
+122,7
@@
struct rpc_auth null_auth = {
};
static
};
static
-
struct rpc_credops
null_credops = {
+
const struct rpc_credops
null_credops = {
.cr_name = "AUTH_NULL",
.crdestroy = nul_destroy_cred,
.crmatch = nul_match,
.cr_name = "AUTH_NULL",
.crdestroy = nul_destroy_cred,
.crmatch = nul_match,
@@
-134,9
+133,11
@@
struct rpc_credops null_credops = {
static
struct rpc_cred null_cred = {
static
struct rpc_cred null_cred = {
+ .cr_lru = LIST_HEAD_INIT(null_cred.cr_lru),
+ .cr_auth = &null_auth,
.cr_ops = &null_credops,
.cr_count = ATOMIC_INIT(1),
.cr_ops = &null_credops,
.cr_count = ATOMIC_INIT(1),
- .cr_flags = RPCAUTH_CRED_UPTODATE,
+ .cr_flags =
1UL <<
RPCAUTH_CRED_UPTODATE,
#ifdef RPC_DEBUG
.cr_magic = RPCAUTH_CRED_MAGIC,
#endif
#ifdef RPC_DEBUG
.cr_magic = RPCAUTH_CRED_MAGIC,
#endif