mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
[PATCH] knfsd: make nlmclnt_next_cookie SMP safe
The way we incremented the NLM cookie in nlmclnt_next_cookie was not thread safe. This patch changes the counter to an atomic_t Signed-off-by: Olaf Kirch <[email protected]> Signed-off-by: Neil Brown <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
abd1f50094
commit
031d869d0e
2 changed files with 6 additions and 5 deletions
|
|
@ -36,14 +36,14 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
|
|||
/*
|
||||
* Cookie counter for NLM requests
|
||||
*/
|
||||
static u32 nlm_cookie = 0x1234;
|
||||
static atomic_t nlm_cookie = ATOMIC_INIT(0x1234);
|
||||
|
||||
static inline void nlmclnt_next_cookie(struct nlm_cookie *c)
|
||||
void nlmclnt_next_cookie(struct nlm_cookie *c)
|
||||
{
|
||||
memcpy(c->data, &nlm_cookie, 4);
|
||||
memset(c->data+4, 0, 4);
|
||||
u32 cookie = atomic_inc_return(&nlm_cookie);
|
||||
|
||||
memcpy(c->data, &cookie, 4);
|
||||
c->len=4;
|
||||
nlm_cookie++;
|
||||
}
|
||||
|
||||
static struct nlm_lockowner *nlm_get_lockowner(struct nlm_lockowner *lockowner)
|
||||
|
|
|
|||
Loading…
Reference in a new issue