CONFIG_FILE_LOCKING should not depend on CONFIG_BLOCK
CONFIG_FILE_LOCKING should not depend on CONFIG_BLOCK. This makes it possible to run complete systems out of a CONFIG_BLOCK=n initramfs on current kernels again (this last worked on 2.6.27.*). Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
55e331cf7e
commit
69050eee8e
14
fs/Kconfig
14
fs/Kconfig
@@ -39,6 +39,13 @@ config FS_POSIX_ACL
|
|||||||
bool
|
bool
|
||||||
default n
|
default n
|
||||||
|
|
||||||
|
source "fs/xfs/Kconfig"
|
||||||
|
source "fs/gfs2/Kconfig"
|
||||||
|
source "fs/ocfs2/Kconfig"
|
||||||
|
source "fs/btrfs/Kconfig"
|
||||||
|
|
||||||
|
endif # BLOCK
|
||||||
|
|
||||||
config FILE_LOCKING
|
config FILE_LOCKING
|
||||||
bool "Enable POSIX file locking API" if EMBEDDED
|
bool "Enable POSIX file locking API" if EMBEDDED
|
||||||
default y
|
default y
|
||||||
@@ -47,13 +54,6 @@ config FILE_LOCKING
|
|||||||
for filesystems like NFS and for the flock() system
|
for filesystems like NFS and for the flock() system
|
||||||
call. Disabling this option saves about 11k.
|
call. Disabling this option saves about 11k.
|
||||||
|
|
||||||
source "fs/xfs/Kconfig"
|
|
||||||
source "fs/gfs2/Kconfig"
|
|
||||||
source "fs/ocfs2/Kconfig"
|
|
||||||
source "fs/btrfs/Kconfig"
|
|
||||||
|
|
||||||
endif # BLOCK
|
|
||||||
|
|
||||||
source "fs/notify/Kconfig"
|
source "fs/notify/Kconfig"
|
||||||
|
|
||||||
source "fs/quota/Kconfig"
|
source "fs/quota/Kconfig"
|
||||||
|
Reference in New Issue
Block a user