aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMonam Agarwal <monamagarwal123@gmail.com>2014-04-07 18:38:54 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-04-07 19:36:07 -0400
commit3f59b067c5140766591a64a3117d86978c57509b (patch)
treedb029b39b6c20c33b07eb486983b9ed19ab3cbc9 /lib
parent90ae3ae539246984d36e43b0e23554bca941476f (diff)
lib/idr.c: use RCU_INIT_POINTER(x, NULL)
Replace rcu_assign_pointer(x, NULL) with RCU_INIT_POINTER(x, NULL) The rcu_assign_pointer() ensures that the initialization of a structure is carried out before storing a pointer to that structure. And in the case of the NULL pointer, there is no structure to initialize. So, rcu_assign_pointer(p, NULL) can be safely converted to RCU_INIT_POINTER(p, NULL) Signed-off-by: Monam Agarwal <monamagarwal123@gmail.com> Acked-by: Tejun Heo <tj@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/idr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/idr.c b/lib/idr.c
index ba2df393c3b0..2642fa8e424d 100644
--- a/lib/idr.c
+++ b/lib/idr.c
@@ -533,7 +533,7 @@ static void sub_remove(struct idr *idp, int shift, int id)
533 n = id & IDR_MASK; 533 n = id & IDR_MASK;
534 if (likely(p != NULL && test_bit(n, p->bitmap))) { 534 if (likely(p != NULL && test_bit(n, p->bitmap))) {
535 __clear_bit(n, p->bitmap); 535 __clear_bit(n, p->bitmap);
536 rcu_assign_pointer(p->ary[n], NULL); 536 RCU_INIT_POINTER(p->ary[n], NULL);
537 to_free = NULL; 537 to_free = NULL;
538 while(*paa && ! --((**paa)->count)){ 538 while(*paa && ! --((**paa)->count)){
539 if (to_free) 539 if (to_free)
@@ -602,7 +602,7 @@ static void __idr_remove_all(struct idr *idp)
602 602
603 n = idp->layers * IDR_BITS; 603 n = idp->layers * IDR_BITS;
604 p = idp->top; 604 p = idp->top;
605 rcu_assign_pointer(idp->top, NULL); 605 RCU_INIT_POINTER(idp->top, NULL);
606 max = idr_max(idp->layers); 606 max = idr_max(idp->layers);
607 607
608 id = 0; 608 id = 0;