diff options
| author | Andrew Morton <akpm@osdl.org> | 2006-03-27 01:17:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-27 08:44:59 -0800 |
| commit | 100873687d81d4ce7b1299b447d33e87ba1e9583 (patch) | |
| tree | d001189d851885fca9a8b287053a4d179c071763 /fs/partitions | |
| parent | 6a4d44c1f1108d6c9e8850e8cf166aaba0e56eae (diff) | |
| download | linux-100873687d81d4ce7b1299b447d33e87ba1e9583.tar.bz2 | |
[PATCH] dm-md-dependency-tree-in-sysfs-holders-slaves-subdirectory-tidy
Remove all the CONFIG_SYSFS stuff. That's supposed to all be implemented up
in header files.
Yes, the CONFIG_SYSFS=n data structures will be a little larger than
necessary, but that's a tradeoff we can decide to make.
Cc: Jun'ichi Nomura <j-nomura@ce.jp.nec.com>
Cc: Alasdair G Kergon <agk@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/partitions')
| -rw-r--r-- | fs/partitions/check.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/fs/partitions/check.c b/fs/partitions/check.c index 60523cea7136..af0cb4b9e784 100644 --- a/fs/partitions/check.c +++ b/fs/partitions/check.c @@ -297,7 +297,6 @@ struct kobj_type ktype_part = { .sysfs_ops = &part_sysfs_ops, }; -#ifdef CONFIG_SYSFS static inline void partition_sysfs_add_subdir(struct hd_struct *p) { struct kobject *k; @@ -316,10 +315,6 @@ static inline void disk_sysfs_add_subdirs(struct gendisk *disk) disk->slave_dir = kobject_add_dir(k, "slaves"); kobject_put(k); } -#else -#define partition_sysfs_add_subdir(x) do { } while (0) -#define disk_sysfs_add_subdirs(x) do { } while (0) -#endif void delete_partition(struct gendisk *disk, int part) { @@ -334,10 +329,8 @@ void delete_partition(struct gendisk *disk, int part) p->ios[0] = p->ios[1] = 0; p->sectors[0] = p->sectors[1] = 0; devfs_remove("%s/part%d", disk->devfs_name, part); -#ifdef CONFIG_SYSFS if (p->holder_dir) kobject_unregister(p->holder_dir); -#endif kobject_unregister(&p->kobj); } @@ -513,12 +506,10 @@ void del_gendisk(struct gendisk *disk) devfs_remove_disk(disk); -#ifdef CONFIG_SYSFS if (disk->holder_dir) kobject_unregister(disk->holder_dir); if (disk->slave_dir) kobject_unregister(disk->slave_dir); -#endif if (disk->driverfs_dev) { char *disk_name = make_block_name(disk); sysfs_remove_link(&disk->kobj, "device"); |