Skip to content

Commit

Permalink
[PATCH] dm: kill lookup_device wrapper
Browse files Browse the repository at this point in the history
Now that lookup_bdev is exported and used by dm just use it directly
instead of through a trivial wrapper.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Christoph Hellwig authored and Al Viro committed Oct 23, 2008
1 parent 3516586 commit 72e8264
Showing 1 changed file with 6 additions and 15 deletions.
21 changes: 6 additions & 15 deletions drivers/md/dm-table.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 72e8264

Please sign in to comment.