diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-31 08:14:29 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-31 08:14:29 +0100 |
| commit | 5fdf7e5975a0b0f6a0370655612c5dca3fd6311b (patch) | |
| tree | 639c536e818c6ace974aa285ba94576df0353b01 /net/sunrpc/auth.c | |
| parent | 7a51cffbd10886c0557677dd916c090097c691ef (diff) | |
| parent | 6a94cb73064c952255336cc57731904174b2c58f (diff) | |
| download | op-kernel-dev-5fdf7e5975a0b0f6a0370655612c5dca3fd6311b.zip op-kernel-dev-5fdf7e5975a0b0f6a0370655612c5dca3fd6311b.tar.gz | |
Merge branch 'linus' into tracing/kmemtrace
Conflicts:
mm/slub.c
Diffstat (limited to 'net/sunrpc/auth.c')
| -rw-r--r-- | net/sunrpc/auth.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c index 0443f83..0c431c2 100644 --- a/net/sunrpc/auth.c +++ b/net/sunrpc/auth.c @@ -234,7 +234,7 @@ rpcauth_prune_expired(struct list_head *free, int nr_to_scan) list_for_each_entry_safe(cred, next, &cred_unused, cr_lru) { /* Enforce a 60 second garbage collection moratorium */ - if (time_in_range(cred->cr_expire, expired, jiffies) && + if (time_in_range_open(cred->cr_expire, expired, jiffies) && test_bit(RPCAUTH_CRED_HASHED, &cred->cr_flags) != 0) continue; @@ -515,7 +515,7 @@ rpcauth_wrap_req(struct rpc_task *task, kxdrproc_t encode, void *rqstp, if (cred->cr_ops->crwrap_req) return cred->cr_ops->crwrap_req(task, encode, rqstp, data, obj); /* By default, we encode the arguments normally. */ - return rpc_call_xdrproc(encode, rqstp, data, obj); + return encode(rqstp, data, obj); } int @@ -530,7 +530,7 @@ rpcauth_unwrap_resp(struct rpc_task *task, kxdrproc_t decode, void *rqstp, return cred->cr_ops->crunwrap_resp(task, decode, rqstp, data, obj); /* By default, we decode the arguments normally. */ - return rpc_call_xdrproc(decode, rqstp, data, obj); + return decode(rqstp, data, obj); } int |
