diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-19 13:46:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-19 13:46:59 -0400 |
| commit | 949b211235cf301790ef4fb903af65d71be29b2a (patch) | |
| tree | 083f7e30e4d48d3c812cef1c8b585522df086c3c /net/sunrpc/auth_gss/auth_gss.c | |
| parent | 0efd9323f32c137b5cf48bc6582cd08556e7cdfc (diff) | |
| parent | a5f9145bc9c340bda743ad51e09bdea60fa3ddfa (diff) | |
Merge git://git.linux-nfs.org/pub/linux/nfs-2.6
* git://git.linux-nfs.org/pub/linux/nfs-2.6:
SUNRPC: Dead code in net/sunrpc/auth_gss/auth_gss.c
NFS: remove needless check in nfs_opendir()
NFS: nfs_show_stats; for_each_possible_cpu(), not NR_CPUS
NFS: make 2 functions static
NFS,SUNRPC: Fix compiler warnings if CONFIG_PROC_FS & CONFIG_SYSCTL are unset
NFS: fix PROC_FS=n compile error
VFS: Fix another open intent Oops
RPCSEC_GSS: fix leak in krb5 code caused by superfluous kmalloc
Diffstat (limited to 'net/sunrpc/auth_gss/auth_gss.c')
| -rw-r--r-- | net/sunrpc/auth_gss/auth_gss.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c index 900ef31f5a0..519ebc17c02 100644 --- a/net/sunrpc/auth_gss/auth_gss.c +++ b/net/sunrpc/auth_gss/auth_gss.c | |||
| @@ -794,7 +794,6 @@ gss_create_cred(struct rpc_auth *auth, struct auth_cred *acred, int flags) | |||
| 794 | 794 | ||
| 795 | out_err: | 795 | out_err: |
| 796 | dprintk("RPC: gss_create_cred failed with error %d\n", err); | 796 | dprintk("RPC: gss_create_cred failed with error %d\n", err); |
| 797 | if (cred) gss_destroy_cred(&cred->gc_base); | ||
| 798 | return ERR_PTR(err); | 797 | return ERR_PTR(err); |
| 799 | } | 798 | } |
| 800 | 799 | ||