Commit 031d869d authored by Olaf Kirch's avatar Olaf Kirch Committed by Linus Torvalds

[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: default avatarOlaf Kirch <okir@suse.de>
Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent abd1f500
...@@ -36,14 +36,14 @@ static const struct rpc_call_ops nlmclnt_cancel_ops; ...@@ -36,14 +36,14 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
/* /*
* Cookie counter for NLM requests * 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); u32 cookie = atomic_inc_return(&nlm_cookie);
memset(c->data+4, 0, 4);
memcpy(c->data, &cookie, 4);
c->len=4; c->len=4;
nlm_cookie++;
} }
static struct nlm_lockowner *nlm_get_lockowner(struct nlm_lockowner *lockowner) static struct nlm_lockowner *nlm_get_lockowner(struct nlm_lockowner *lockowner)
......
...@@ -157,6 +157,7 @@ int nlmclnt_block(struct nlm_wait *block, struct nlm_rqst *req, long timeout) ...@@ -157,6 +157,7 @@ int nlmclnt_block(struct nlm_wait *block, struct nlm_rqst *req, long timeout)
u32 nlmclnt_grant(const struct sockaddr_in *addr, const struct nlm_lock *); u32 nlmclnt_grant(const struct sockaddr_in *addr, const struct nlm_lock *);
void nlmclnt_recovery(struct nlm_host *); void nlmclnt_recovery(struct nlm_host *);
int nlmclnt_reclaim(struct nlm_host *, struct file_lock *); int nlmclnt_reclaim(struct nlm_host *, struct file_lock *);
void nlmclnt_next_cookie(struct nlm_cookie *);
/* /*
* Host cache * Host cache
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment