diff options
| author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2014-02-17 13:35:57 -0800 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-02-18 12:21:26 -0800 |
| commit | ec6c676a08b0779a32c9cec9fae7532add32fe15 (patch) | |
| tree | e76b0548ed7bc4a2927aa3bc4e3bec2bc8adf7da /block | |
| parent | e3ebf0d457039c857dfeb45434e3be9780dea499 (diff) | |
| download | linux-ec6c676a08b0779a32c9cec9fae7532add32fe15.tar.gz linux-ec6c676a08b0779a32c9cec9fae7532add32fe15.tar.bz2 linux-ec6c676a08b0779a32c9cec9fae7532add32fe15.zip | |
block: Substitute rcu_access_pointer() for rcu_dereference_raw()
(Trivial patch.)
If the code is looking at the RCU-protected pointer itself, but not
dereferencing it, the rcu_dereference() functions can be downgraded to
rcu_access_pointer(). This commit makes this downgrade in blkg_destroy()
and ioc_destroy_icq(), both of which simply compare the RCU-protected
pointer against another pointer with no dereferencing.
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-cgroup.c | 2 | ||||
| -rw-r--r-- | block/blk-ioc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index 4e491d9b5292..b6e95b5e262f 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -336,7 +336,7 @@ static void blkg_destroy(struct blkcg_gq *blkg) * under queue_lock. If it's not pointing to @blkg now, it never * will. Hint assignment itself can race safely. */ - if (rcu_dereference_raw(blkcg->blkg_hint) == blkg) + if (rcu_access_pointer(blkcg->blkg_hint) == blkg) rcu_assign_pointer(blkcg->blkg_hint, NULL); /* diff --git a/block/blk-ioc.c b/block/blk-ioc.c index 242df01413f6..1a27f45ec776 100644 --- a/block/blk-ioc.c +++ b/block/blk-ioc.c @@ -68,7 +68,7 @@ static void ioc_destroy_icq(struct io_cq *icq) * under queue_lock. If it's not pointing to @icq now, it never * will. Hint assignment itself can race safely. */ - if (rcu_dereference_raw(ioc->icq_hint) == icq) + if (rcu_access_pointer(ioc->icq_hint) == icq) rcu_assign_pointer(ioc->icq_hint, NULL); ioc_exit_icq(icq); |