diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 01:43:25 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 01:43:25 -0500 |
| commit | d9bc125caf592b7d081021f32ce5b717efdf70c8 (patch) | |
| tree | 263b7066ba22ddce21db610c0300f6eaac6f2064 /net/sunrpc/svcauth.c | |
| parent | 43d78ef2ba5bec26d0315859e8324bfc0be23766 (diff) | |
| parent | ec2f9d1331f658433411c58077871e1eef4ee1b4 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
net/sunrpc/auth_gss/gss_krb5_crypto.c
net/sunrpc/auth_gss/gss_spkm3_token.c
net/sunrpc/clnt.c
Merge with mainline and fix conflicts.
Diffstat (limited to 'net/sunrpc/svcauth.c')
| -rw-r--r-- | net/sunrpc/svcauth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sunrpc/svcauth.c b/net/sunrpc/svcauth.c index c7bb5f7f21a5..811a24c83262 100644 --- a/net/sunrpc/svcauth.c +++ b/net/sunrpc/svcauth.c | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | * linux/net/sunrpc/svcauth.c | 2 | * linux/net/sunrpc/svcauth.c |
| 3 | * | 3 | * |
| 4 | * The generic interface for RPC authentication on the server side. | 4 | * The generic interface for RPC authentication on the server side. |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> | 6 | * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> |
| 7 | * | 7 | * |
| 8 | * CHANGES | 8 | * CHANGES |
| @@ -74,7 +74,7 @@ int svc_authorise(struct svc_rqst *rqstp) | |||
| 74 | int rv = 0; | 74 | int rv = 0; |
| 75 | 75 | ||
| 76 | rqstp->rq_authop = NULL; | 76 | rqstp->rq_authop = NULL; |
| 77 | 77 | ||
| 78 | if (aops) { | 78 | if (aops) { |
| 79 | rv = aops->release(rqstp); | 79 | rv = aops->release(rqstp); |
| 80 | module_put(aops->owner); | 80 | module_put(aops->owner); |