block: move disk_name and related helpers out of partition-generic.c (5cbd28e3) · Commits · 戴 / test

block/bio.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -680,6 +680,12 @@ struct bio bio_clone_fast(struct bio bio, gfp_t gfp_mask, struct bio_set *bs)
		}
		EXPORT_SYMBOL(bio_clone_fast);

		const char bio_devname(struct bio bio, char *buf)
		{
		return disk_name(bio->bi_disk, bio->bi_partno, buf);
		}
		EXPORT_SYMBOL(bio_devname);

		static inline bool page_is_mergeable(const struct bio_vec *bv,
		struct page *page, unsigned int len, unsigned int off,
		bool *same_page)

+21 −0

Original line number	Diff line number	Diff line
		@@ -69,6 +69,27 @@ void set_capacity_revalidate_and_notify(struct gendisk *disk, sector_t size,

		EXPORT_SYMBOL_GPL(set_capacity_revalidate_and_notify);

		/*
		* Format the device name of the indicated disk into the supplied buffer and
		* return a pointer to that same buffer for convenience.
		*/
		char disk_name(struct gendisk hd, int partno, char *buf)
		{
		if (!partno)
		snprintf(buf, BDEVNAME_SIZE, "%s", hd->disk_name);
		else if (isdigit(hd->disk_name[strlen(hd->disk_name)-1]))
		snprintf(buf, BDEVNAME_SIZE, "%sp%d", hd->disk_name, partno);
		else
		snprintf(buf, BDEVNAME_SIZE, "%s%d", hd->disk_name, partno);

		return buf;
		}

		const char bdevname(struct block_device bdev, char *buf)
		{
		return disk_name(bdev->bd_disk, bdev->bd_part->partno, buf);
		}
		EXPORT_SYMBOL(bdevname);

		void part_inc_in_flight(struct request_queue q, struct hd_struct part, int rw)
		{

+0 −32

Original line number	Diff line number	Diff line
		@@ -25,38 +25,6 @@
		extern void md_autodetect_dev(dev_t dev);
		#endif

		/*
		* disk_name() is used by partition check code and the genhd driver.
		* It formats the devicename of the indicated disk into
		* the supplied buffer (of size at least 32), and returns
		* a pointer to that same buffer (for convenience).
		*/

		char disk_name(struct gendisk hd, int partno, char *buf)
		{
		if (!partno)
		snprintf(buf, BDEVNAME_SIZE, "%s", hd->disk_name);
		else if (isdigit(hd->disk_name[strlen(hd->disk_name)-1]))
		snprintf(buf, BDEVNAME_SIZE, "%sp%d", hd->disk_name, partno);
		else
		snprintf(buf, BDEVNAME_SIZE, "%s%d", hd->disk_name, partno);

		return buf;
		}

		const char bdevname(struct block_device bdev, char *buf)
		{
		return disk_name(bdev->bd_disk, bdev->bd_part->partno, buf);
		}

		EXPORT_SYMBOL(bdevname);

		const char bio_devname(struct bio bio, char *buf)
		{
		return disk_name(bio->bi_disk, bio->bi_partno, buf);
		}
		EXPORT_SYMBOL(bio_devname);

		static ssize_t part_partition_show(struct device *dev,
		struct device_attribute attr, char buf)
		{