lkml.org 
[lkml]   [2018]   [Dec]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 14/14] blkcg: rename blkg_try_get() to blkg_tryget()
    Date
    blkg reference counting now uses percpu_ref rather than atomic_t. Let's
    make this consistent with css_tryget. This renames blkg_try_get to
    blkg_tryget and now returns a bool rather than the blkg or %NULL.

    Signed-off-by: Dennis Zhou <dennis@kernel.org>
    Reviewed-by: Josef Bacik <josef@toxicpanda.com>
    Acked-by: Tejun Heo <tj@kernel.org>
    ---
    block/bio.c | 2 +-
    block/blk-cgroup.c | 3 +--
    block/blk-iolatency.c | 2 +-
    include/linux/blk-cgroup.h | 12 +++++-------
    4 files changed, 8 insertions(+), 11 deletions(-)

    diff --git a/block/bio.c b/block/bio.c
    index 7ec5316e6ecc..06760543ec81 100644
    --- a/block/bio.c
    +++ b/block/bio.c
    @@ -1990,7 +1990,7 @@ static void __bio_associate_blkg(struct bio *bio, struct blkcg_gq *blkg)
    {
    bio_disassociate_blkg(bio);

    - bio->bi_blkg = blkg_try_get_closest(blkg);
    + bio->bi_blkg = blkg_tryget_closest(blkg);
    }

    /**
    diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
    index 2ca7611fe274..6bd0619a7d6e 100644
    --- a/block/blk-cgroup.c
    +++ b/block/blk-cgroup.c
    @@ -1736,8 +1736,7 @@ void blkcg_maybe_throttle_current(void)
    blkg = blkg_lookup(blkcg, q);
    if (!blkg)
    goto out;
    - blkg = blkg_try_get(blkg);
    - if (!blkg)
    + if (!blkg_tryget(blkg))
    goto out;
    rcu_read_unlock();

    diff --git a/block/blk-iolatency.c b/block/blk-iolatency.c
    index 5a79f06a730d..0b14c3d57769 100644
    --- a/block/blk-iolatency.c
    +++ b/block/blk-iolatency.c
    @@ -698,7 +698,7 @@ static void blkiolatency_timer_fn(struct timer_list *t)
    * We could be exiting, don't access the pd unless we have a
    * ref on the blkg.
    */
    - if (!blkg_try_get(blkg))
    + if (!blkg_tryget(blkg))
    continue;

    iolat = blkg_to_lat(blkg);
    diff --git a/include/linux/blk-cgroup.h b/include/linux/blk-cgroup.h
    index 05909cf31ed1..64ac89130ae8 100644
    --- a/include/linux/blk-cgroup.h
    +++ b/include/linux/blk-cgroup.h
    @@ -490,27 +490,25 @@ static inline void blkg_get(struct blkcg_gq *blkg)
    }

    /**
    - * blkg_try_get - try and get a blkg reference
    + * blkg_tryget - try and get a blkg reference
    * @blkg: blkg to get
    *
    * This is for use when doing an RCU lookup of the blkg. We may be in the midst
    * of freeing this blkg, so we can only use it if the refcnt is not zero.
    */
    -static inline struct blkcg_gq *blkg_try_get(struct blkcg_gq *blkg)
    +static inline bool blkg_tryget(struct blkcg_gq *blkg)
    {
    - if (percpu_ref_tryget(&blkg->refcnt))
    - return blkg;
    - return NULL;
    + return percpu_ref_tryget(&blkg->refcnt);
    }

    /**
    - * blkg_try_get_closest - try and get a blkg ref on the closet blkg
    + * blkg_tryget_closest - try and get a blkg ref on the closet blkg
    * @blkg: blkg to get
    *
    * This walks up the blkg tree to find the closest non-dying blkg and returns
    * the blkg that it did association with as it may not be the passed in blkg.
    */
    -static inline struct blkcg_gq *blkg_try_get_closest(struct blkcg_gq *blkg)
    +static inline struct blkcg_gq *blkg_tryget_closest(struct blkcg_gq *blkg)
    {
    while (!percpu_ref_tryget(&blkg->refcnt))
    blkg = blkg->parent;
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-12-04 19:37    [W:2.525 / U:0.284 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site