aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-03-27 04:17:56 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-27 11:44:59 -0500
commit100873687d81d4ce7b1299b447d33e87ba1e9583 (patch)
treed001189d851885fca9a8b287053a4d179c071763 /fs
parent6a4d44c1f1108d6c9e8850e8cf166aaba0e56eae (diff)
[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')
-rw-r--r--fs/partitions/check.c9
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 = {
297 .sysfs_ops = &part_sysfs_ops, 297 .sysfs_ops = &part_sysfs_ops,
298}; 298};
299 299
300#ifdef CONFIG_SYSFS
301static inline void partition_sysfs_add_subdir(struct hd_struct *p) 300static inline void partition_sysfs_add_subdir(struct hd_struct *p)
302{ 301{
303 struct kobject *k; 302 struct kobject *k;
@@ -316,10 +315,6 @@ static inline void disk_sysfs_add_subdirs(struct gendisk *disk)
316 disk->slave_dir = kobject_add_dir(k, "slaves"); 315 disk->slave_dir = kobject_add_dir(k, "slaves");
317 kobject_put(k); 316 kobject_put(k);
318} 317}
319#else
320#define partition_sysfs_add_subdir(x) do { } while (0)
321#define disk_sysfs_add_subdirs(x) do { } while (0)
322#endif
323 318
324void delete_partition(struct gendisk *disk, int part) 319void delete_partition(struct gendisk *disk, int part)
325{ 320{
@@ -334,10 +329,8 @@ void delete_partition(struct gendisk *disk, int part)
334 p->ios[0] = p->ios[1] = 0; 329 p->ios[0] = p->ios[1] = 0;
335 p->sectors[0] = p->sectors[1] = 0; 330 p->sectors[0] = p->sectors[1] = 0;
336 devfs_remove("%s/part%d", disk->devfs_name, part); 331 devfs_remove("%s/part%d", disk->devfs_name, part);
337#ifdef CONFIG_SYSFS
338 if (p->holder_dir) 332 if (p->holder_dir)
339 kobject_unregister(p->holder_dir); 333 kobject_unregister(p->holder_dir);
340#endif
341 kobject_unregister(&p->kobj); 334 kobject_unregister(&p->kobj);
342} 335}
343 336
@@ -513,12 +506,10 @@ void del_gendisk(struct gendisk *disk)
513 506
514 devfs_remove_disk(disk); 507 devfs_remove_disk(disk);
515 508
516#ifdef CONFIG_SYSFS
517 if (disk->holder_dir) 509 if (disk->holder_dir)
518 kobject_unregister(disk->holder_dir); 510 kobject_unregister(disk->holder_dir);
519 if (disk->slave_dir) 511 if (disk->slave_dir)
520 kobject_unregister(disk->slave_dir); 512 kobject_unregister(disk->slave_dir);
521#endif
522 if (disk->driverfs_dev) { 513 if (disk->driverfs_dev) {
523 char *disk_name = make_block_name(disk); 514 char *disk_name = make_block_name(disk);
524 sysfs_remove_link(&disk->kobj, "device"); 515 sysfs_remove_link(&disk->kobj, "device");