summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreea-Cristina Bernat <bernat.ada@gmail.com>2014-08-18 17:41:01 +0300
committerJens Axboe <axboe@fb.com>2014-11-04 13:17:08 -0700
commit062261be4e39e35bdf2fba16a4b2d8a432ae8281 (patch)
treea423860d3876bcecd1b09cf30c651114377ce04e
parent5905535610fc6b11379a999ff45bfa39f0d605b6 (diff)
downloadlinux-stable-062261be4e39e35bdf2fba16a4b2d8a432ae8281.tar.gz
linux-stable-062261be4e39e35bdf2fba16a4b2d8a432ae8281.tar.bz2
linux-stable-062261be4e39e35bdf2fba16a4b2d8a432ae8281.zip
nvme: Replace rcu_assign_pointer() with RCU_INIT_POINTER()
The use of "rcu_assign_pointer()" is NULLing out the pointer. According to RCU_INIT_POINTER()'s block comment: "1. This use of RCU_INIT_POINTER() is NULLing out the pointer" it is better to use it instead of rcu_assign_pointer() because it has a smaller overhead. The following Coccinelle semantic patch was used: @@ @@ - rcu_assign_pointer + RCU_INIT_POINTER (..., NULL) Signed-off-by: Andreea-Cristina Bernat <bernat.ada@gmail.com> Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com> Signed-off-by: Jens Axboe <axboe@fb.com>
-rw-r--r--drivers/block/nvme-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index 5d44c9344522..c1e3c1a101b8 100644
--- a/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@ -1230,7 +1230,7 @@ static void nvme_free_queues(struct nvme_dev *dev, int lowest)
for (i = dev->queue_count - 1; i >= lowest; i--) {
nvmeq = raw_nvmeq(dev, i);
- rcu_assign_pointer(dev->queues[i], NULL);
+ RCU_INIT_POINTER(dev->queues[i], NULL);
llist_add(&nvmeq->node, &q_list);
dev->queue_count--;
}