Commit eb7ae5e0 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

bdi: move bdi_dev_name out of line 



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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 156c7573

include/linux/backing-dev.h

+1 −8
Original line number Diff line number Diff line
@@ -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 */

mm/backing-dev.c

+9 −1
Original line number Diff line number Diff line
@@ -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])

CRA Git | Maintained and supported by SUSTech CRA and CCSE