Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

fs/lockd/clntproc.c

+5 −5
Original line number Diff line number Diff line
@@ -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)

include/linux/lockd/lockd.h

+1 −0
Original line number Diff line number Diff line
@@ -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 *);

void		  nlmclnt_recovery(struct nlm_host *);

int		  nlmclnt_reclaim(struct nlm_host *, struct file_lock *);

void		  nlmclnt_next_cookie(struct nlm_cookie *);



/*

 * Host cache