aboutsummaryrefslogtreecommitdiffstats
path: root/driver
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2007-10-23 20:38:10 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2007-10-23 20:38:10 -0700
commit31d9a7021a66b444e813827431e09448e1ac7a27 (patch)
tree2e63eae41c116ee04e9be2e1766b019747e81863 /driver
parent1be73aaa9220a54b3c9d532035fa778bf176bd98 (diff)
downloadpatches-31d9a7021a66b444e813827431e09448e1ac7a27.tar.gz
kay's update to block-device.patch
Diffstat (limited to 'driver')
-rw-r--r--driver/block-device.patch7
1 files changed, 3 insertions, 4 deletions
diff --git a/driver/block-device.patch b/driver/block-device.patch
index 6dbc11ea063902..14dd6f0d4642b7 100644
--- a/driver/block-device.patch
+++ b/driver/block-device.patch
@@ -35,10 +35,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/md/dm.c | 4
drivers/md/md.c | 8
fs/block_dev.c | 8
- fs/partitions/check.c | 316 +++++++++++-----------------------
+ fs/partitions/check.c | 315 +++++++++++-----------------------
include/linux/genhd.h | 29 +--
init/do_mounts.c | 108 -----------
- 12 files changed, 373 insertions(+), 603 deletions(-)
+ 12 files changed, 372 insertions(+), 603 deletions(-)
--- a/block/genhd.c
@@ -1479,7 +1479,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
}
-@@ -602,19 +509,12 @@ void del_gendisk(struct gendisk *disk)
+@@ -602,19 +509,11 @@ void del_gendisk(struct gendisk *disk)
disk_stat_set_all(disk, 0);
disk->stamp = 0;
@@ -1503,7 +1503,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+ sysfs_remove_link(&block_depr, disk->dev.bus_id);
+#endif
+ device_del(&disk->dev);
-+ put_device(&disk->dev);
}
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h