diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-17 17:57:20 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-17 17:57:20 -0400 |
| commit | 393d81aa026e19b6ede6f5f11955c97ee62e5df5 (patch) | |
| tree | a1d9511e488e19d41089ff0a736f6ce52a81c6e5 /net/sunrpc/auth_unix.c | |
| parent | 93a0886e2368eafb9df5e2021fb185195cee88b2 (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into xen-64bit
Diffstat (limited to 'net/sunrpc/auth_unix.c')
| -rw-r--r-- | net/sunrpc/auth_unix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sunrpc/auth_unix.c b/net/sunrpc/auth_unix.c index 44920b90bdc4..46b2647c5bd2 100644 --- a/net/sunrpc/auth_unix.c +++ b/net/sunrpc/auth_unix.c | |||
| @@ -66,7 +66,7 @@ unx_create_cred(struct rpc_auth *auth, struct auth_cred *acred, int flags) | |||
| 66 | dprintk("RPC: allocating UNIX cred for uid %d gid %d\n", | 66 | dprintk("RPC: allocating UNIX cred for uid %d gid %d\n", |
| 67 | acred->uid, acred->gid); | 67 | acred->uid, acred->gid); |
| 68 | 68 | ||
| 69 | if (!(cred = kmalloc(sizeof(*cred), GFP_KERNEL))) | 69 | if (!(cred = kmalloc(sizeof(*cred), GFP_NOFS))) |
| 70 | return ERR_PTR(-ENOMEM); | 70 | return ERR_PTR(-ENOMEM); |
| 71 | 71 | ||
| 72 | rpcauth_init_cred(&cred->uc_base, acred, auth, &unix_credops); | 72 | rpcauth_init_cred(&cred->uc_base, acred, auth, &unix_credops); |