[PATCH 1/2] block: do_mounts - accept root=<non-existant partition>

Previous thread: Kernel Panic when accessing NFS share and locking files by Michael Lang on Wednesday, May 14, 2008 - 1:27 pm. (6 messages)

Next thread: [announce] "kill the Big Kernel Lock (BKL)" tree by Ingo Molnar on Wednesday, May 14, 2008 - 1:49 pm. (69 messages)
To: Linus Torvalds <torvalds@...>, Andrew Morton <akpm@...>
Cc: <linux-kernel@...>
Date: Wednesday, May 14, 2008 - 1:49 pm

Here are two patches against your 2.6.26-rc2-git tree.

They do:
- remove an unused list head in struct class now that struct
class_device is gone.
- fix a bug at boot time with raid partitions. This is a
regression from 2.6.24 that is now finally fixed. Many thanks
to Kay for doing this work. It will be added to the
2.6.25-stable tree as well.

Please pull from:
master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6.git/

Both of these patches have been in the -next and -mm trees for a while.

The patch will be sent as a follow-on to this message to lkml for people
to see.

thanks,

greg k-h

------------

block/genhd.c | 9 ++++++---
drivers/base/class.c | 1 -
include/linux/device.h | 1 -
include/linux/genhd.h | 4 ++--
init/do_mounts.c | 27 ++++++++++++++++++++++++++-
5 files changed, 34 insertions(+), 8 deletions(-)

---------------

Dave Young (1):
Driver core: struct class remove children list

Kay Sievers (1):
block: do_mounts - accept root=<non-existant partition>

--

To: <linux-kernel@...>
Cc: Dave Young <hidave.darkstar@...>, Greg Kroah-Hartman <gregkh@...>
Date: Wednesday, May 14, 2008 - 1:49 pm

From: Dave Young <hidave.darkstar@gmail.com>

because of the class_device was removed, now do the children list removing

Signed-off-by: Dave Young <hidave.darkstar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/base/class.c | 1 -
include/linux/device.h | 1 -
2 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/drivers/base/class.c b/drivers/base/class.c
index 0ef00e8..e085af0 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -140,7 +140,6 @@ int class_register(struct class *cls)

pr_debug("device class '%s': registering\n", cls->name);

- INIT_LIST_HEAD(&cls->children);
INIT_LIST_HEAD(&cls->devices);
INIT_LIST_HEAD(&cls->interfaces);
kset_init(&cls->class_dirs);
diff --git a/include/linux/device.h b/include/linux/device.h
index 8c23e3d..15e9fa3 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -183,7 +183,6 @@ struct class {
struct module *owner;

struct kset subsys;
- struct list_head children;
struct list_head devices;
struct list_head interfaces;
struct kset class_dirs;
--
1.5.5.1

--

To: <linux-kernel@...>
Cc: Kay Sievers <kay.sievers@...>, stable <stable@...>, Greg Kroah-Hartman <gregkh@...>
Date: Wednesday, May 14, 2008 - 1:49 pm

From: Kay Sievers <kay.sievers@vrfy.org>

Some devices, like md, may create partitions only at first access,
so allow root= to be set to a valid non-existant partition of an
existing disk. This applies only to non-initramfs root mounting.

This fixes a regression from 2.6.24 which did allow this to happen and
broke some users machines :(

Acked-by: Neil Brown <neilb@suse.de>
Tested-by: Joao Luis Meloni Assirati <assirati@nonada.if.usp.br>
Cc: stable <stable@kernel.org>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
block/genhd.c | 9 ++++++---
include/linux/genhd.h | 4 ++--
init/do_mounts.c | 27 ++++++++++++++++++++++++++-
3 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/block/genhd.c b/block/genhd.c
index fda9c7a..129ad93 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -653,7 +653,7 @@ void genhd_media_change_notify(struct gendisk *disk)
EXPORT_SYMBOL_GPL(genhd_media_change_notify);
#endif /* 0 */

-dev_t blk_lookup_devt(const char *name)
+dev_t blk_lookup_devt(const char *name, int part)
{
struct device *dev;
dev_t devt = MKDEV(0, 0);
@@ -661,7 +661,11 @@ dev_t blk_lookup_devt(const char *name)
mutex_lock(&block_class_lock);
list_for_each_entry(dev, &block_class.devices, node) {
if (strcmp(dev->bus_id, name) == 0) {
- devt = dev->devt;
+ struct gendisk *disk = dev_to_disk(dev);
+
+ if (part < disk->minors)
+ devt = MKDEV(MAJOR(dev->devt),
+ MINOR(dev->devt) + part);
break;
}
}
@@ -669,7 +673,6 @@ dev_t blk_lookup_devt(const char *name)

return devt;
}
-
EXPORT_SYMBOL(blk_lookup_devt);

struct gendisk *alloc_disk(int minors)
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index e9874e7..ae7aec3 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -525,7 +525,7 @@ struct unixware_disklabel {
#define ADDPART_FLAG_RAID 1
...

Previous thread: Kernel Panic when accessing NFS share and locking files by Michael Lang on Wednesday, May 14, 2008 - 1:27 pm. (6 messages)

Next thread: [announce] "kill the Big Kernel Lock (BKL)" tree by Ingo Molnar on Wednesday, May 14, 2008 - 1:49 pm. (69 messages)