projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] knfsd: use new lock for svc_sock deferred list
[powerpc.git]
/
net
/
sunrpc
/
auth_unix.c
diff --git
a/net/sunrpc/auth_unix.c
b/net/sunrpc/auth_unix.c
index
1b3ed4f
..
f7f990c
100644
(file)
--- a/
net/sunrpc/auth_unix.c
+++ b/
net/sunrpc/auth_unix.c
@@
-75,7
+75,7
@@
unx_create_cred(struct rpc_auth *auth, struct auth_cred *acred, int flags)
atomic_set(&cred->uc_count, 1);
cred->uc_flags = RPCAUTH_CRED_UPTODATE;
atomic_set(&cred->uc_count, 1);
cred->uc_flags = RPCAUTH_CRED_UPTODATE;
- if (flags & RPC
_TASK
_ROOTCREDS) {
+ if (flags & RPC
AUTH_LOOKUP
_ROOTCREDS) {
cred->uc_uid = 0;
cred->uc_gid = 0;
cred->uc_gids[0] = NOGROUP;
cred->uc_uid = 0;
cred->uc_gid = 0;
cred->uc_gids[0] = NOGROUP;
@@
-108,12
+108,12
@@
unx_destroy_cred(struct rpc_cred *cred)
* request root creds (e.g. for NFS swapping).
*/
static int
* request root creds (e.g. for NFS swapping).
*/
static int
-unx_match(struct auth_cred *acred, struct rpc_cred *rcred, int
task
flags)
+unx_match(struct auth_cred *acred, struct rpc_cred *rcred, int flags)
{
struct unx_cred *cred = (struct unx_cred *) rcred;
int i;
{
struct unx_cred *cred = (struct unx_cred *) rcred;
int i;
- if (!(
taskflags & RPC_TASK
_ROOTCREDS)) {
+ if (!(
flags & RPCAUTH_LOOKUP
_ROOTCREDS)) {
int groups;
if (cred->uc_uid != acred->uid
int groups;
if (cred->uc_uid != acred->uid
@@
-137,12
+137,12
@@
unx_match(struct auth_cred *acred, struct rpc_cred *rcred, int taskflags)
* Marshal credentials.
* Maybe we should keep a cached credential for performance reasons.
*/
* Marshal credentials.
* Maybe we should keep a cached credential for performance reasons.
*/
-static
u
32 *
-unx_marshal(struct rpc_task *task,
u
32 *p)
+static
__be
32 *
+unx_marshal(struct rpc_task *task,
__be
32 *p)
{
struct rpc_clnt *clnt = task->tk_client;
struct unx_cred *cred = (struct unx_cred *) task->tk_msg.rpc_cred;
{
struct rpc_clnt *clnt = task->tk_client;
struct unx_cred *cred = (struct unx_cred *) task->tk_msg.rpc_cred;
-
u32
*base, *hold;
+
__be32
*base, *hold;
int i;
*p++ = htonl(RPC_AUTH_UNIX);
int i;
*p++ = htonl(RPC_AUTH_UNIX);
@@
-178,8
+178,8
@@
unx_refresh(struct rpc_task *task)
return 0;
}
return 0;
}
-static
u
32 *
-unx_validate(struct rpc_task *task,
u
32 *p)
+static
__be
32 *
+unx_validate(struct rpc_task *task,
__be
32 *p)
{
rpc_authflavor_t flavor;
u32 size;
{
rpc_authflavor_t flavor;
u32 size;
@@
-225,6
+225,7
@@
struct rpc_auth unix_auth = {
.au_cslack = UNX_WRITESLACK,
.au_rslack = 2, /* assume AUTH_NULL verf */
.au_ops = &authunix_ops,
.au_cslack = UNX_WRITESLACK,
.au_rslack = 2, /* assume AUTH_NULL verf */
.au_ops = &authunix_ops,
+ .au_flavor = RPC_AUTH_UNIX,
.au_count = ATOMIC_INIT(0),
.au_credcache = &unix_cred_cache,
};
.au_count = ATOMIC_INIT(0),
.au_credcache = &unix_cred_cache,
};