git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
block
/
genhd.c
diff --git
a/drivers/block/genhd.c
b/drivers/block/genhd.c
index
2c84953
..
e82caa2
100644
(file)
--- a/
drivers/block/genhd.c
+++ b/
drivers/block/genhd.c
@@
-90,7
+90,7
@@
int register_blkdev(unsigned int major, const char *name)
p->major = major;
strlcpy(p->name, name, sizeof(p->name));
p->major = major;
strlcpy(p->name, name, sizeof(p->name));
- p->next =
0
;
+ p->next =
NULL
;
index = major_to_index(major);
spin_lock_irqsave(&major_names_lock, flags);
index = major_to_index(major);
spin_lock_irqsave(&major_names_lock, flags);
@@
-352,6
+352,12
@@
static ssize_t disk_range_read(struct gendisk * disk, char *page)
{
return sprintf(page, "%d\n", disk->minors);
}
{
return sprintf(page, "%d\n", disk->minors);
}
+static ssize_t disk_removable_read(struct gendisk * disk, char *page)
+{
+ return sprintf(page, "%d\n",
+ (disk->flags & GENHD_FL_REMOVABLE ? 1 : 0));
+
+}
static ssize_t disk_size_read(struct gendisk * disk, char *page)
{
return sprintf(page, "%llu\n", (unsigned long long)get_capacity(disk));
static ssize_t disk_size_read(struct gendisk * disk, char *page)
{
return sprintf(page, "%llu\n", (unsigned long long)get_capacity(disk));
@@
-384,6
+390,10
@@
static struct disk_attribute disk_attr_range = {
.attr = {.name = "range", .mode = S_IRUGO },
.show = disk_range_read
};
.attr = {.name = "range", .mode = S_IRUGO },
.show = disk_range_read
};
+static struct disk_attribute disk_attr_removable = {
+ .attr = {.name = "removable", .mode = S_IRUGO },
+ .show = disk_removable_read
+};
static struct disk_attribute disk_attr_size = {
.attr = {.name = "size", .mode = S_IRUGO },
.show = disk_size_read
static struct disk_attribute disk_attr_size = {
.attr = {.name = "size", .mode = S_IRUGO },
.show = disk_size_read
@@
-396,6
+406,7
@@
static struct disk_attribute disk_attr_stat = {
static struct attribute * default_attrs[] = {
&disk_attr_dev.attr,
&disk_attr_range.attr,
static struct attribute * default_attrs[] = {
&disk_attr_dev.attr,
&disk_attr_range.attr,
+ &disk_attr_removable.attr,
&disk_attr_size.attr,
&disk_attr_stat.attr,
NULL,
&disk_attr_size.attr,
&disk_attr_stat.attr,
NULL,