Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ed62e8e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "block: Get rid of blk_get_backing_dev_info()"

parents 7bcbd3ae b8439981

block/blk-core.c

+0 −14
Original line number Diff line number Diff line
@@ -105,20 +105,6 @@ void blk_queue_congestion_threshold(struct request_queue *q) 
	q->nr_congestion_off = nr;

}



/**

 * blk_get_backing_dev_info - get the address of a queue's backing_dev_info

 * @bdev:	device

 *

 * Locates the passed device's request queue and returns the address of its

 * backing_dev_info. The return value is never NULL however we may return

 * &noop_backing_dev_info if the bdev is not currently open.

 */

struct backing_dev_info *blk_get_backing_dev_info(struct block_device *bdev)

{

	return bdev->bd_bdi;

}

EXPORT_SYMBOL(blk_get_backing_dev_info);



void blk_rq_init(struct request_queue *q, struct request *rq)

{

	memset(rq, 0, sizeof(*rq));

block/compat_ioctl.c

+2 −5
Original line number Diff line number Diff line
@@ -661,7 +661,6 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg) 
	struct block_device *bdev = inode->i_bdev;

	struct gendisk *disk = bdev->bd_disk;

	fmode_t mode = file->f_mode;

	struct backing_dev_info *bdi;

	loff_t size;

	unsigned int max_sectors;
@@ -708,9 +707,8 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg) 
	case BLKFRAGET:

		if (!arg)

			return -EINVAL;

		bdi = blk_get_backing_dev_info(bdev);

		return compat_put_long(arg,

				       (bdi->ra_pages * PAGE_SIZE) / 512);

			       (bdev->bd_bdi->ra_pages * PAGE_SIZE) / 512);

	case BLKROGET: /* compatible */

		return compat_put_int(arg, bdev_read_only(bdev) != 0);

	case BLKBSZGET_32: /* get the logical block size (cf. BLKSSZGET) */
@@ -728,8 +726,7 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg) 
	case BLKFRASET:

		if (!capable(CAP_SYS_ADMIN))

			return -EACCES;

		bdi = blk_get_backing_dev_info(bdev);

		bdi->ra_pages = (arg * 512) / PAGE_SIZE;

		bdev->bd_bdi->ra_pages = (arg * 512) / PAGE_SIZE;

		return 0;

	case BLKGETSIZE:

		size = i_size_read(bdev->bd_inode);

block/ioctl.c

+2 −5
Original line number Diff line number Diff line
@@ -502,7 +502,6 @@ static int blkdev_bszset(struct block_device *bdev, fmode_t mode, 
int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,

			unsigned long arg)

{

	struct backing_dev_info *bdi;

	void __user *argp = (void __user *)arg;

	loff_t size;

	unsigned int max_sectors;
@@ -525,8 +524,7 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd, 
	case BLKFRAGET:

		if (!arg)

			return -EINVAL;

		bdi = blk_get_backing_dev_info(bdev);

		return put_long(arg, (bdi->ra_pages * PAGE_SIZE) / 512);

		return put_long(arg, (bdev->bd_bdi->ra_pages*PAGE_SIZE) / 512);

	case BLKROGET:

		return put_int(arg, bdev_read_only(bdev) != 0);

	case BLKBSZGET: /* get block device soft block size (cf. BLKSSZGET) */
@@ -553,8 +551,7 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd, 
	case BLKFRASET:

		if(!capable(CAP_SYS_ADMIN))

			return -EACCES;

		bdi = blk_get_backing_dev_info(bdev);

		bdi->ra_pages = (arg * 512) / PAGE_SIZE;

		bdev->bd_bdi->ra_pages = (arg * 512) / PAGE_SIZE;

		return 0;

	case BLKBSZSET:

		return blkdev_bszset(bdev, mode, argp);

fs/btrfs/disk-io.c

+1 −1
Original line number Diff line number Diff line
@@ -1816,7 +1816,7 @@ static int btrfs_congested_fn(void *congested_data, int bdi_bits) 
	list_for_each_entry_rcu(device, &info->fs_devices->devices, dev_list) {

		if (!device->bdev)

			continue;

		bdi = blk_get_backing_dev_info(device->bdev);

		bdi = device->bdev->bd_bdi;

		if (bdi_congested(bdi, bdi_bits)) {

			ret = 1;

			break;

fs/btrfs/volumes.c

+1 −1
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ static noinline void run_scheduled_bios(struct btrfs_device *device) 
	 */

	blk_start_plug(&plug);



	bdi = blk_get_backing_dev_info(device->bdev);

	bdi = device->bdev->bd_bdi;

	fs_info = device->dev_root->fs_info;

	limit = btrfs_async_submit_limit(fs_info);

	limit = limit * 2 / 3;