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

Commit 72e8264e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Al Viro
Browse files

[PATCH] dm: kill lookup_device wrapper 



Now that lookup_bdev is exported and used by dm just use it directly
instead of through a trivial wrapper.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 3516586a

drivers/md/dm-table.c

+6 −15
Original line number Diff line number Diff line
@@ -312,19 +312,6 @@ static inline int check_space(struct dm_table *t) 
	return 0;

}



/*

 * Convert a device path to a dev_t.

 */

static int lookup_device(const char *path, dev_t *dev)

{

	struct block_device *bdev = lookup_bdev(path);

	if (IS_ERR(bdev))

		return PTR_ERR(bdev);

	*dev = bdev->bd_dev;

	bdput(bdev);

	return 0;

}



/*

 * See if we've already got a device in the list.

 */
@@ -437,8 +424,12 @@ static int __table_get_device(struct dm_table *t, struct dm_target *ti, 
			return -EOVERFLOW;

	} else {

		/* convert the path to a device */

		if ((r = lookup_device(path, &dev)))

			return r;

		struct block_device *bdev = lookup_bdev(path);



		if (IS_ERR(bdev))

			return PTR_ERR(bdev);

		dev = bdev->bd_dev;

		bdput(bdev);

	}



	dd = find_device(&t->devices, dev);