lkml.org 
[lkml]   [2020]   [May]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.6 114/118] bdi: move bdi_dev_name out of line
    Date
    From: Christoph Hellwig <hch@lst.de>

    [ Upstream commit eb7ae5e06bb6e6ac6bb86872d27c43ebab92f6b2 ]

    bdi_dev_name is not a fast path function, move it out of line. This
    prepares for using it from modular callers without having to export
    an implementation detail like bdi_unknown_name.

    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Reviewed-by: Jan Kara <jack@suse.cz>
    Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Reviewed-by: Bart Van Assche <bvanassche@acm.org>
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    include/linux/backing-dev.h | 9 +--------
    mm/backing-dev.c | 10 +++++++++-
    2 files changed, 10 insertions(+), 9 deletions(-)

    diff --git a/include/linux/backing-dev.h b/include/linux/backing-dev.h
    index f88197c1ffc2d..c9ad5c3b7b4b2 100644
    --- a/include/linux/backing-dev.h
    +++ b/include/linux/backing-dev.h
    @@ -505,13 +505,6 @@ static inline int bdi_rw_congested(struct backing_dev_info *bdi)
    (1 << WB_async_congested));
    }

    -extern const char *bdi_unknown_name;
    -
    -static inline const char *bdi_dev_name(struct backing_dev_info *bdi)
    -{
    - if (!bdi || !bdi->dev)
    - return bdi_unknown_name;
    - return dev_name(bdi->dev);
    -}
    +const char *bdi_dev_name(struct backing_dev_info *bdi);

    #endif /* _LINUX_BACKING_DEV_H */
    diff --git a/mm/backing-dev.c b/mm/backing-dev.c
    index 62f05f605fb5b..680e5028d0fc5 100644
    --- a/mm/backing-dev.c
    +++ b/mm/backing-dev.c
    @@ -21,7 +21,7 @@ struct backing_dev_info noop_backing_dev_info = {
    EXPORT_SYMBOL_GPL(noop_backing_dev_info);

    static struct class *bdi_class;
    -const char *bdi_unknown_name = "(unknown)";
    +static const char *bdi_unknown_name = "(unknown)";

    /*
    * bdi_lock protects bdi_tree and updates to bdi_list. bdi_list has RCU
    @@ -1043,6 +1043,14 @@ void bdi_put(struct backing_dev_info *bdi)
    }
    EXPORT_SYMBOL(bdi_put);

    +const char *bdi_dev_name(struct backing_dev_info *bdi)
    +{
    + if (!bdi || !bdi->dev)
    + return bdi_unknown_name;
    + return dev_name(bdi->dev);
    +}
    +EXPORT_SYMBOL_GPL(bdi_dev_name);
    +
    static wait_queue_head_t congestion_wqh[2] = {
    __WAIT_QUEUE_HEAD_INITIALIZER(congestion_wqh[0]),
    __WAIT_QUEUE_HEAD_INITIALIZER(congestion_wqh[1])
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-05-13 12:10    [W:2.571 / U:0.216 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site