Prev: mm: Move ARCH_SLAB_MINALIGN and ARCH_KMALLOC_MINALIGN to <linux/slab_def.h>
Next: scheduler: cleanup sched.c and extract cgroup_cpuaccount stuff into separate file
From: Will Drewry on 19 May 2010 14:50
Replace major:minor parsing with name_to_dev_t. This
maintains the current functionality (as the code was the same),
but adds support for the hexadecimal dev as well as device lookup
before the root filesystem is available. The latter is the motivation
for this change.

It still falls back to lookup_bdev() for cases where the inode
on disk provides more information than the name (and the path exceeds
the length handled by name_to_dev_t).

Signed-off-by: Will Drewry <wad(a)chromium.org>
---
drivers/md/dm-table.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index ef6a3ab..589e86a 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -11,6 +11,7 @@
#include <linux/vmalloc.h>
#include <linux/blkdev.h>
#include <linux/namei.h>
+#include <linux/mount.h>
#include <linux/ctype.h>
#include <linux/string.h>
#include <linux/slab.h>
@@ -434,17 +435,16 @@ static int __table_get_device(struct dm_table *t, struct dm_target *ti,
int r;
dev_t uninitialized_var(dev);
struct dm_dev_internal *dd;
- unsigned int major, minor;
+ char base_path[32]; /* size from name_to_dev_t */

BUG_ON(!t);

- if (sscanf(path, "%u:%u", &major, &minor) == 2) {
- /* Extract the major/minor numbers */
- dev = MKDEV(major, minor);
- if (MAJOR(dev) != major || MINOR(dev) != minor)
- return -EOVERFLOW;
- } else {
- /* convert the path to a device */
+ /* stage the shorter path for name_to_dev_t. */
+ strncpy(base_path, path, sizeof(base_path));
+
+ /* lookup by major:minor or registered device name */
+ if (!(dev = name_to_dev_t(base_path))) {
+ /* convert the path to a device by finding its inode */
struct block_device *bdev = lookup_bdev(path);

if (IS_ERR(bdev))
--
1.7.0.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: mm: Move ARCH_SLAB_MINALIGN and ARCH_KMALLOC_MINALIGN to <linux/slab_def.h>
Next: scheduler: cleanup sched.c and extract cgroup_cpuaccount stuff into separate file