diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-24 06:48:46 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-24 06:48:46 -0400 |
| commit | 8c82a17e9c924c0e9f13e75e4c2f6bca19a4b516 (patch) | |
| tree | d535f46a917e14e90deccb29ad00aac016ad18dd /net/sunrpc/auth.c | |
| parent | 4ce72a2c063a7fa8e42a9435440ae3364115a58d (diff) | |
| parent | 57f8f7b60db6f1ed2c6918ab9230c4623a9dbe37 (diff) | |
Merge commit 'v2.6.28-rc1' into sched/urgent
Diffstat (limited to 'net/sunrpc/auth.c')
| -rw-r--r-- | net/sunrpc/auth.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c index 6bfea9ed6869..436bf1b4b76c 100644 --- a/net/sunrpc/auth.c +++ b/net/sunrpc/auth.c | |||
| @@ -83,10 +83,8 @@ rpcauth_create(rpc_authflavor_t pseudoflavor, struct rpc_clnt *clnt) | |||
| 83 | if (flavor >= RPC_AUTH_MAXFLAVOR) | 83 | if (flavor >= RPC_AUTH_MAXFLAVOR) |
| 84 | goto out; | 84 | goto out; |
| 85 | 85 | ||
| 86 | #ifdef CONFIG_KMOD | ||
| 87 | if ((ops = auth_flavors[flavor]) == NULL) | 86 | if ((ops = auth_flavors[flavor]) == NULL) |
| 88 | request_module("rpc-auth-%u", flavor); | 87 | request_module("rpc-auth-%u", flavor); |
| 89 | #endif | ||
| 90 | spin_lock(&rpc_authflavor_lock); | 88 | spin_lock(&rpc_authflavor_lock); |
| 91 | ops = auth_flavors[flavor]; | 89 | ops = auth_flavors[flavor]; |
| 92 | if (ops == NULL || !try_module_get(ops->owner)) { | 90 | if (ops == NULL || !try_module_get(ops->owner)) { |