Skip to content

Commit

Permalink
[PATCH] small partitions/msdos cleanups
Browse files Browse the repository at this point in the history
This patch makes the following changes to the msdos partition code:
- remove CONFIG_NEC98_PARTITION leftovers
- make parse_bsd static

This patch was already ACK'ed by Andries Brouwer.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Adrian Bunk authored and Linus Torvalds committed Jun 25, 2005
1 parent 40086ea commit 486fd40
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 10 deletions.
1 change: 0 additions & 1 deletion fs/partitions/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,3 @@ obj-$(CONFIG_SUN_PARTITION) += sun.o
obj-$(CONFIG_ULTRIX_PARTITION) += ultrix.o
obj-$(CONFIG_IBM_PARTITION) += ibm.o
obj-$(CONFIG_EFI_PARTITION) += efi.o
obj-$(CONFIG_NEC98_PARTITION) += nec98.o msdos.o
3 changes: 0 additions & 3 deletions fs/partitions/check.c
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,6 @@ static int (*check_part[])(struct parsed_partitions *, struct block_device *) =
#ifdef CONFIG_LDM_PARTITION
ldm_partition, /* this must come before msdos */
#endif
#ifdef CONFIG_NEC98_PARTITION
nec98_partition, /* must be come before `msdos_partition' */
#endif
#ifdef CONFIG_MSDOS_PARTITION
msdos_partition,
#endif
Expand Down
4 changes: 0 additions & 4 deletions fs/partitions/check.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,3 @@ put_partition(struct parsed_partitions *p, int n, sector_t from, sector_t size)

extern int warn_no_part;

extern void parse_bsd(struct parsed_partitions *state,
struct block_device *bdev, u32 offset, u32 size,
int origin, char *flavour, int max_partitions);

4 changes: 2 additions & 2 deletions fs/partitions/msdos.c
Original file line number Diff line number Diff line change
Expand Up @@ -202,12 +202,12 @@ parse_solaris_x86(struct parsed_partitions *state, struct block_device *bdev,
#endif
}

#if defined(CONFIG_BSD_DISKLABEL) || defined(CONFIG_NEC98_PARTITION)
#if defined(CONFIG_BSD_DISKLABEL)
/*
* Create devices for BSD partitions listed in a disklabel, under a
* dos-like partition. See parse_extended() for more information.
*/
void
static void
parse_bsd(struct parsed_partitions *state, struct block_device *bdev,
u32 offset, u32 size, int origin, char *flavour,
int max_partitions)
Expand Down

0 comments on commit 486fd40

Please sign in to comment.