diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-12 16:39:34 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-12 16:39:34 -0400 |
| commit | 1d7b24ff335489dd7e864b71ba5b35eaa25b625a (patch) | |
| tree | f27815967e44510a833cf0e017c2ecc004c14e8d /net | |
| parent | 68f0d9d92e5430e250f2bd2a1e7a350e880d776a (diff) | |
| parent | 23c323af0375a7f63732bed0386aba5935b8de69 (diff) | |
Merge tag 'nfs-for-3.12-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
Pull NFS client bugfixes (part 2) from Trond Myklebust:
"Bugfixes:
- Fix a few credential reference leaks resulting from the
SP4_MACH_CRED NFSv4.1 state protection code.
- Fix the SUNRPC bloatometer footprint: convert a 256K hashtable into
the intended 64 byte structure.
- Fix a long standing XDR issue with FREE_STATEID
- Fix a potential WARN_ON spamming issue
- Fix a missing dprintk() kuid conversion
New features:
- Enable the NFSv4.1 state protection support for the WRITE and
COMMIT operations"
* tag 'nfs-for-3.12-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
SUNRPC: No, I did not intend to create a 256KiB hashtable
sunrpc: Add missing kuids conversion for printing
NFSv4.1: sp4_mach_cred: WARN_ON -> WARN_ON_ONCE
NFSv4.1: sp4_mach_cred: no need to ref count creds
NFSv4.1: fix SECINFO* use of put_rpccred
NFSv4.1: sp4_mach_cred: ask for WRITE and COMMIT
NFSv4.1 fix decode_free_stateid
Diffstat (limited to 'net')
| -rw-r--r-- | net/sunrpc/auth_generic.c | 2 | ||||
| -rw-r--r-- | net/sunrpc/auth_gss/auth_gss.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/sunrpc/auth_generic.c b/net/sunrpc/auth_generic.c index f6d84be49050..ed04869b2d4f 100644 --- a/net/sunrpc/auth_generic.c +++ b/net/sunrpc/auth_generic.c | |||
| @@ -239,7 +239,7 @@ generic_key_timeout(struct rpc_auth *auth, struct rpc_cred *cred) | |||
| 239 | if (test_and_clear_bit(RPC_CRED_KEY_EXPIRE_SOON, | 239 | if (test_and_clear_bit(RPC_CRED_KEY_EXPIRE_SOON, |
| 240 | &acred->ac_flags)) | 240 | &acred->ac_flags)) |
| 241 | dprintk("RPC: UID %d Credential key reset\n", | 241 | dprintk("RPC: UID %d Credential key reset\n", |
| 242 | tcred->cr_uid); | 242 | from_kuid(&init_user_ns, tcred->cr_uid)); |
| 243 | /* set up fasttrack for the normal case */ | 243 | /* set up fasttrack for the normal case */ |
| 244 | set_bit(RPC_CRED_NOTIFY_TIMEOUT, &acred->ac_flags); | 244 | set_bit(RPC_CRED_NOTIFY_TIMEOUT, &acred->ac_flags); |
| 245 | } | 245 | } |
diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c index 30eb502135bb..fcac5d141717 100644 --- a/net/sunrpc/auth_gss/auth_gss.c +++ b/net/sunrpc/auth_gss/auth_gss.c | |||
| @@ -75,7 +75,7 @@ static unsigned int gss_key_expire_timeo = GSS_KEY_EXPIRE_TIMEO; | |||
| 75 | * using integrity (two 4-byte integers): */ | 75 | * using integrity (two 4-byte integers): */ |
| 76 | #define GSS_VERF_SLACK 100 | 76 | #define GSS_VERF_SLACK 100 |
| 77 | 77 | ||
| 78 | static DEFINE_HASHTABLE(gss_auth_hash_table, 16); | 78 | static DEFINE_HASHTABLE(gss_auth_hash_table, 4); |
| 79 | static DEFINE_SPINLOCK(gss_auth_hash_lock); | 79 | static DEFINE_SPINLOCK(gss_auth_hash_lock); |
| 80 | 80 | ||
| 81 | struct gss_pipe { | 81 | struct gss_pipe { |