diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-08-12 15:21:34 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-08-12 15:21:34 +1000 |
commit | 59d4edabdcce10c5fe75955fc766673f1caf310d (patch) | |
tree | c22e39c36b809d409acd3e48a02eaa2327fbd15f /drivers | |
parent | 540d6223a23e1fbab24edaa42daae1bfe8953385 (diff) | |
parent | dd9207c31d6712a4665f197db7740da6c633cea7 (diff) |
Merge commit 'vfs/for-next'
Conflicts:
fs/nfsd/export.c
fs/xfs/linux-2.6/xfs_export.c
fs/xfs/linux-2.6/xfs_iops.c
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/md/dm-table.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c index 61f441409234..b6ae39e4ad22 100644 --- a/drivers/md/dm-table.c +++ b/drivers/md/dm-table.c @@ -312,19 +312,6 @@ static inline int check_space(struct dm_table *t) } /* - * 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. */ static struct dm_dev *find_device(struct list_head *l, dev_t dev) @@ -433,8 +420,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); |