From 9be96f3fd10187f185d84cf878cf032465bcced3 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Fri, 16 Sep 2011 00:25:05 -0400 Subject: [PATCH] move fs/partitions to block/ Signed-off-by: Al Viro --- block/Kconfig | 6 ++++++ block/Makefile | 3 ++- {fs => block}/partitions/Kconfig | 0 {fs => block}/partitions/Makefile | 0 {fs => block}/partitions/acorn.c | 0 {fs => block}/partitions/acorn.h | 0 {fs => block}/partitions/amiga.c | 0 {fs => block}/partitions/amiga.h | 0 {fs => block}/partitions/atari.c | 0 {fs => block}/partitions/atari.h | 0 {fs => block}/partitions/check.c | 0 {fs => block}/partitions/check.h | 0 {fs => block}/partitions/efi.c | 0 {fs => block}/partitions/efi.h | 0 {fs => block}/partitions/ibm.c | 0 {fs => block}/partitions/ibm.h | 0 {fs => block}/partitions/karma.c | 0 {fs => block}/partitions/karma.h | 0 {fs => block}/partitions/ldm.c | 0 {fs => block}/partitions/ldm.h | 0 {fs => block}/partitions/mac.c | 0 {fs => block}/partitions/mac.h | 0 {fs => block}/partitions/msdos.c | 0 {fs => block}/partitions/msdos.h | 0 {fs => block}/partitions/osf.c | 0 {fs => block}/partitions/osf.h | 0 {fs => block}/partitions/sgi.c | 0 {fs => block}/partitions/sgi.h | 0 {fs => block}/partitions/sun.c | 0 {fs => block}/partitions/sun.h | 0 {fs => block}/partitions/sysv68.c | 0 {fs => block}/partitions/sysv68.h | 0 {fs => block}/partitions/ultrix.c | 0 {fs => block}/partitions/ultrix.h | 0 fs/Kconfig | 8 -------- fs/Makefile | 1 - 36 files changed, 8 insertions(+), 10 deletions(-) rename {fs => block}/partitions/Kconfig (100%) rename {fs => block}/partitions/Makefile (100%) rename {fs => block}/partitions/acorn.c (100%) rename {fs => block}/partitions/acorn.h (100%) rename {fs => block}/partitions/amiga.c (100%) rename {fs => block}/partitions/amiga.h (100%) rename {fs => block}/partitions/atari.c (100%) rename {fs => block}/partitions/atari.h (100%) rename {fs => block}/partitions/check.c (100%) rename {fs => block}/partitions/check.h (100%) rename {fs => block}/partitions/efi.c (100%) rename {fs => block}/partitions/efi.h (100%) rename {fs => block}/partitions/ibm.c (100%) rename {fs => block}/partitions/ibm.h (100%) rename {fs => block}/partitions/karma.c (100%) rename {fs => block}/partitions/karma.h (100%) rename {fs => block}/partitions/ldm.c (100%) rename {fs => block}/partitions/ldm.h (100%) rename {fs => block}/partitions/mac.c (100%) rename {fs => block}/partitions/mac.h (100%) rename {fs => block}/partitions/msdos.c (100%) rename {fs => block}/partitions/msdos.h (100%) rename {fs => block}/partitions/osf.c (100%) rename {fs => block}/partitions/osf.h (100%) rename {fs => block}/partitions/sgi.c (100%) rename {fs => block}/partitions/sgi.h (100%) rename {fs => block}/partitions/sun.c (100%) rename {fs => block}/partitions/sun.h (100%) rename {fs => block}/partitions/sysv68.c (100%) rename {fs => block}/partitions/sysv68.h (100%) rename {fs => block}/partitions/ultrix.c (100%) rename {fs => block}/partitions/ultrix.h (100%) diff --git a/block/Kconfig b/block/Kconfig index e97934eecec..09acf1b3990 100644 --- a/block/Kconfig +++ b/block/Kconfig @@ -99,6 +99,12 @@ config BLK_DEV_THROTTLING See Documentation/cgroups/blkio-controller.txt for more information. +menu "Partition Types" + +source "block/partitions/Kconfig" + +endmenu + endif # BLOCK config BLOCK_COMPAT diff --git a/block/Makefile b/block/Makefile index 514c6e4f427..3199c0cdef5 100644 --- a/block/Makefile +++ b/block/Makefile @@ -5,7 +5,8 @@ obj-$(CONFIG_BLOCK) := elevator.o blk-core.o blk-tag.o blk-sysfs.o \ blk-flush.o blk-settings.o blk-ioc.o blk-map.o \ blk-exec.o blk-merge.o blk-softirq.o blk-timeout.o \ - blk-iopoll.o blk-lib.o ioctl.o genhd.o scsi_ioctl.o + blk-iopoll.o blk-lib.o ioctl.o genhd.o scsi_ioctl.o \ + partitions/ obj-$(CONFIG_BLK_DEV_BSG) += bsg.o obj-$(CONFIG_BLK_DEV_BSGLIB) += bsg-lib.o diff --git a/fs/partitions/Kconfig b/block/partitions/Kconfig similarity index 100% rename from fs/partitions/Kconfig rename to block/partitions/Kconfig diff --git a/fs/partitions/Makefile b/block/partitions/Makefile similarity index 100% rename from fs/partitions/Makefile rename to block/partitions/Makefile diff --git a/fs/partitions/acorn.c b/block/partitions/acorn.c similarity index 100% rename from fs/partitions/acorn.c rename to block/partitions/acorn.c diff --git a/fs/partitions/acorn.h b/block/partitions/acorn.h similarity index 100% rename from fs/partitions/acorn.h rename to block/partitions/acorn.h diff --git a/fs/partitions/amiga.c b/block/partitions/amiga.c similarity index 100% rename from fs/partitions/amiga.c rename to block/partitions/amiga.c diff --git a/fs/partitions/amiga.h b/block/partitions/amiga.h similarity index 100% rename from fs/partitions/amiga.h rename to block/partitions/amiga.h diff --git a/fs/partitions/atari.c b/block/partitions/atari.c similarity index 100% rename from fs/partitions/atari.c rename to block/partitions/atari.c diff --git a/fs/partitions/atari.h b/block/partitions/atari.h similarity index 100% rename from fs/partitions/atari.h rename to block/partitions/atari.h diff --git a/fs/partitions/check.c b/block/partitions/check.c similarity index 100% rename from fs/partitions/check.c rename to block/partitions/check.c diff --git a/fs/partitions/check.h b/block/partitions/check.h similarity index 100% rename from fs/partitions/check.h rename to block/partitions/check.h diff --git a/fs/partitions/efi.c b/block/partitions/efi.c similarity index 100% rename from fs/partitions/efi.c rename to block/partitions/efi.c diff --git a/fs/partitions/efi.h b/block/partitions/efi.h similarity index 100% rename from fs/partitions/efi.h rename to block/partitions/efi.h diff --git a/fs/partitions/ibm.c b/block/partitions/ibm.c similarity index 100% rename from fs/partitions/ibm.c rename to block/partitions/ibm.c diff --git a/fs/partitions/ibm.h b/block/partitions/ibm.h similarity index 100% rename from fs/partitions/ibm.h rename to block/partitions/ibm.h diff --git a/fs/partitions/karma.c b/block/partitions/karma.c similarity index 100% rename from fs/partitions/karma.c rename to block/partitions/karma.c diff --git a/fs/partitions/karma.h b/block/partitions/karma.h similarity index 100% rename from fs/partitions/karma.h rename to block/partitions/karma.h diff --git a/fs/partitions/ldm.c b/block/partitions/ldm.c similarity index 100% rename from fs/partitions/ldm.c rename to block/partitions/ldm.c diff --git a/fs/partitions/ldm.h b/block/partitions/ldm.h similarity index 100% rename from fs/partitions/ldm.h rename to block/partitions/ldm.h diff --git a/fs/partitions/mac.c b/block/partitions/mac.c similarity index 100% rename from fs/partitions/mac.c rename to block/partitions/mac.c diff --git a/fs/partitions/mac.h b/block/partitions/mac.h similarity index 100% rename from fs/partitions/mac.h rename to block/partitions/mac.h diff --git a/fs/partitions/msdos.c b/block/partitions/msdos.c similarity index 100% rename from fs/partitions/msdos.c rename to block/partitions/msdos.c diff --git a/fs/partitions/msdos.h b/block/partitions/msdos.h similarity index 100% rename from fs/partitions/msdos.h rename to block/partitions/msdos.h diff --git a/fs/partitions/osf.c b/block/partitions/osf.c similarity index 100% rename from fs/partitions/osf.c rename to block/partitions/osf.c diff --git a/fs/partitions/osf.h b/block/partitions/osf.h similarity index 100% rename from fs/partitions/osf.h rename to block/partitions/osf.h diff --git a/fs/partitions/sgi.c b/block/partitions/sgi.c similarity index 100% rename from fs/partitions/sgi.c rename to block/partitions/sgi.c diff --git a/fs/partitions/sgi.h b/block/partitions/sgi.h similarity index 100% rename from fs/partitions/sgi.h rename to block/partitions/sgi.h diff --git a/fs/partitions/sun.c b/block/partitions/sun.c similarity index 100% rename from fs/partitions/sun.c rename to block/partitions/sun.c diff --git a/fs/partitions/sun.h b/block/partitions/sun.h similarity index 100% rename from fs/partitions/sun.h rename to block/partitions/sun.h diff --git a/fs/partitions/sysv68.c b/block/partitions/sysv68.c similarity index 100% rename from fs/partitions/sysv68.c rename to block/partitions/sysv68.c diff --git a/fs/partitions/sysv68.h b/block/partitions/sysv68.h similarity index 100% rename from fs/partitions/sysv68.h rename to block/partitions/sysv68.h diff --git a/fs/partitions/ultrix.c b/block/partitions/ultrix.c similarity index 100% rename from fs/partitions/ultrix.c rename to block/partitions/ultrix.c diff --git a/fs/partitions/ultrix.h b/block/partitions/ultrix.h similarity index 100% rename from fs/partitions/ultrix.h rename to block/partitions/ultrix.h diff --git a/fs/Kconfig b/fs/Kconfig index 5f4c45d4aa1..30145d886bc 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -266,14 +266,6 @@ source "fs/9p/Kconfig" endif # NETWORK_FILESYSTEMS -if BLOCK -menu "Partition Types" - -source "fs/partitions/Kconfig" - -endmenu -endif - source "fs/nls/Kconfig" source "fs/dlm/Kconfig" diff --git a/fs/Makefile b/fs/Makefile index d2c3353d547..c36ebec298b 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -52,7 +52,6 @@ obj-$(CONFIG_FHANDLE) += fhandle.o obj-y += quota/ obj-$(CONFIG_PROC_FS) += proc/ -obj-y += partitions/ obj-$(CONFIG_SYSFS) += sysfs/ obj-$(CONFIG_CONFIGFS_FS) += configfs/ obj-y += devpts/