Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8ae50ba authored by David Woodhouse's avatar David Woodhouse Committed by Linus Torvalds
Browse files

Remove <linux/genhd.h> from user-visible headers. 



It was all wrapped in '#ifdef CONFIG_BLOCK' anyway, so userspace was
getting nothing useful out of it. And the special #ifndef __KERNEL__
version of 'struct partition' makes me inclined to promote an attitude
of violence...

Stick some comments on some of the #endifs too, while we're at it.

Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0738c4bb

include/linux/Kbuild

+0 −1
Original line number Original line Diff line number Diff line
@@ -205,7 +205,6 @@ unifdef-y += futex.h 
unifdef-y += fs.h

unifdef-y += fs.h

unifdef-y += gameport.h

unifdef-y += gameport.h

unifdef-y += generic_serial.h

unifdef-y += generic_serial.h

unifdef-y += genhd.h

unifdef-y += gfs2_ondisk.h

unifdef-y += gfs2_ondisk.h

unifdef-y += hayesesp.h

unifdef-y += hayesesp.h

unifdef-y += hdlcdrv.h

unifdef-y += hdlcdrv.h

include/linux/genhd.h

+3 −27
Original line number Original line Diff line number Diff line
@@ -55,24 +55,6 @@ enum { 
	UNIXWARE_PARTITION = 0x63,	/* Same as GNU_HURD and SCO Unix */

	UNIXWARE_PARTITION = 0x63,	/* Same as GNU_HURD and SCO Unix */

};

};





#ifndef __KERNEL__



struct partition {

	unsigned char boot_ind;		/* 0x80 - active */

	unsigned char head;		/* starting head */

	unsigned char sector;		/* starting sector */

	unsigned char cyl;		/* starting cylinder */

	unsigned char sys_ind;		/* What partition type */

	unsigned char end_head;		/* end head */

	unsigned char end_sector;	/* end sector */

	unsigned char end_cyl;		/* end cylinder */

	unsigned int start_sect;	/* starting sector counting from 0 */

	unsigned int nr_sects;		/* nr of sectors in partition */

} __attribute__((packed));



#endif



#ifdef __KERNEL__

#include <linux/major.h>

#include <linux/major.h>

#include <linux/device.h>

#include <linux/device.h>

#include <linux/smp.h>

#include <linux/smp.h>
@@ -228,7 +210,7 @@ static inline void part_stat_set_all(struct hd_struct *part, int value) { 
		       sizeof(struct disk_stats));

		       sizeof(struct disk_stats));

}

}

				

				

#else

#else /* !CONFIG_SMP */

#define __disk_stat_add(gendiskp, field, addnd) \

#define __disk_stat_add(gendiskp, field, addnd) \

				(gendiskp->dkstats.field += addnd)

				(gendiskp->dkstats.field += addnd)

#define disk_stat_read(gendiskp, field)	(gendiskp->dkstats.field)

#define disk_stat_read(gendiskp, field)	(gendiskp->dkstats.field)
@@ -256,7 +238,7 @@ static inline void part_stat_set_all(struct hd_struct *part, int value) 
	memset(&part->dkstats, value, sizeof(struct disk_stats));

	memset(&part->dkstats, value, sizeof(struct disk_stats));

}

}





#endif

#endif /* CONFIG_SMP */





#define disk_stat_add(gendiskp, field, addnd)			\

#define disk_stat_add(gendiskp, field, addnd)			\

	do {							\

	do {							\
@@ -395,8 +377,6 @@ static inline void set_capacity(struct gendisk *disk, sector_t size) 
	disk->capacity = size;

	disk->capacity = size;

}

}





#endif  /*  __KERNEL__  */



#ifdef CONFIG_SOLARIS_X86_PARTITION

#ifdef CONFIG_SOLARIS_X86_PARTITION





#define SOLARIS_X86_NUMSLICE	16

#define SOLARIS_X86_NUMSLICE	16
@@ -540,8 +520,6 @@ struct unixware_disklabel { 
#   define MINIX_NR_SUBPARTITIONS  4

#   define MINIX_NR_SUBPARTITIONS  4

#endif /* CONFIG_MINIX_SUBPARTITION */

#endif /* CONFIG_MINIX_SUBPARTITION */





#ifdef __KERNEL__



#define ADDPART_FLAG_NONE	0

#define ADDPART_FLAG_NONE	0

#define ADDPART_FLAG_RAID	1

#define ADDPART_FLAG_RAID	1

#define ADDPART_FLAG_WHOLEDISK	2

#define ADDPART_FLAG_WHOLEDISK	2
@@ -570,8 +548,6 @@ static inline struct block_device *bdget_disk(struct gendisk *disk, int index) 
	return bdget(MKDEV(disk->major, disk->first_minor) + index);

	return bdget(MKDEV(disk->major, disk->first_minor) + index);

}

}





#endif



#else /* CONFIG_BLOCK */

#else /* CONFIG_BLOCK */





static inline void printk_all_partitions(void) { }

static inline void printk_all_partitions(void) { }
@@ -584,4 +560,4 @@ static inline dev_t blk_lookup_devt(const char *name) 




#endif /* CONFIG_BLOCK */

#endif /* CONFIG_BLOCK */





#endif
 
#endif /* _LINUX_GENHD_H */