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

Commit 03010a33 authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

ext4: Rename ext4dev to ext4 



The ext4 filesystem is getting stable enough that it's time to drop
the "dev" prefix.  Also remove the requirement for the TEST_FILESYS
flag.

Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 39d80c33

Documentation/filesystems/ext4.txt

+4 −4
Original line number Diff line number Diff line
@@ -32,9 +32,9 @@ Mailing list: linux-ext4@vger.kernel.org 
    you will need to merge your changes with the version from e2fsprogs

    1.41.x.



  - Create a new filesystem using the ext4dev filesystem type:

  - Create a new filesystem using the ext4 filesystem type:



    	# mke2fs -t ext4dev /dev/hda1

    	# mke2fs -t ext4 /dev/hda1



    Or configure an existing ext3 filesystem to support extents and set

    the test_fs flag to indicate that it's ok for an in-development
@@ -47,13 +47,13 @@ Mailing list: linux-ext4@vger.kernel.org 


        # tune2fs -I 256 /dev/hda1



    (Note: we currently do not have tools to convert an ext4dev

    (Note: we currently do not have tools to convert an ext4

    filesystem back to ext3; so please do not do try this on production

    filesystems.)



  - Mounting:



	# mount -t ext4dev /dev/hda1 /wherever

	# mount -t ext4 /dev/hda1 /wherever



  - When comparing performance with other filesystems, remember that

    ext3/4 by default offers higher data integrity guarantees than most.

fs/Kconfig

+51 −37
Original line number Diff line number Diff line
@@ -136,37 +136,51 @@ config EXT3_FS_SECURITY 
	  If you are not using a security module that requires using

	  extended attributes for file security labels, say N.



config EXT4DEV_FS

	tristate "Ext4dev/ext4 extended fs support development (EXPERIMENTAL)"

	depends on EXPERIMENTAL

config EXT4_FS

	tristate "The Extended 4 (ext4) filesystem"

	select JBD2

	select CRC16

	help

	  Ext4dev is a predecessor filesystem of the next generation

	  extended fs ext4, based on ext3 filesystem code. It will be

	  renamed ext4 fs later, once ext4dev is mature and stabilized.

	  This is the next generation of the ext3 filesystem.



	  Unlike the change from ext2 filesystem to ext3 filesystem,

	  the on-disk format of ext4dev is not the same as ext3 any more:

	  it is based on extent maps and it supports 48-bit physical block

	  numbers. These combined on-disk format changes will allow

	  ext4dev/ext4 to handle more than 16 TB filesystem volumes --

	  a hard limit that ext3 cannot overcome without changing the

	  on-disk format.



	  Other than extent maps and 48-bit block numbers, ext4dev also is

	  likely to have other new features such as persistent preallocation,

	  high resolution time stamps, and larger file support etc.  These

	  features will be added to ext4dev gradually.

	  the on-disk format of ext4 is not forwards compatible with

	  ext3; it is based on extent maps and it supports 48-bit

	  physical block numbers.  The ext4 filesystem also supports delayed

	  allocation, persistent preallocation, high resolution time stamps,

	  and a number of other features to improve performance and speed

	  up fsck time.  For more information, please see the web pages at

	  http://ext4.wiki.kernel.org.



	  The ext4 filesystem will support mounting an ext3

	  filesystem; while there will be some performance gains from

	  the delayed allocation and inode table readahead, the best

	  performance gains will require enabling ext4 features in the

	  filesystem, or formating a new filesystem as an ext4

	  filesystem initially.



	  To compile this file system support as a module, choose M here. The

	  module will be called ext4dev.



	  If unsure, say N.



config EXT4DEV_FS_XATTR

	bool "Ext4dev extended attributes"

	depends on EXT4DEV_FS

config EXT4DEV_COMPAT

	bool "Enable ext4dev compatibility"

	depends on EXT4_FS

	help

	  Starting with 2.6.28, the name of the ext4 filesystem was

	  renamed from ext4dev to ext4.  Unfortunately there are some

	  lagecy userspace programs (such as klibc's fstype) have

	  "ext4dev" hardcoded.  



	  To enable backwards compatibility so that systems that are

	  still expecting to mount ext4 filesystems using ext4dev,

	  chose Y here.   This feature will go away by 2.6.31, so

	  please arrange to get your userspace programs fixed!



config EXT4_FS_XATTR

	bool "Ext4 extended attributes"

	depends on EXT4_FS

	default y

	help

	  Extended attributes are name:value pairs associated with inodes by
@@ -175,11 +189,11 @@ config EXT4DEV_FS_XATTR 


	  If unsure, say N.



	  You need this for POSIX ACL support on ext4dev/ext4.

	  You need this for POSIX ACL support on ext4.



config EXT4DEV_FS_POSIX_ACL

	bool "Ext4dev POSIX Access Control Lists"

	depends on EXT4DEV_FS_XATTR

config EXT4_FS_POSIX_ACL

	bool "Ext4 POSIX Access Control Lists"

	depends on EXT4_FS_XATTR

	select FS_POSIX_ACL

	help

	  POSIX Access Control Lists (ACLs) support permissions for users and
@@ -190,14 +204,14 @@ config EXT4DEV_FS_POSIX_ACL 


	  If you don't know what Access Control Lists are, say N



config EXT4DEV_FS_SECURITY

	bool "Ext4dev Security Labels"

	depends on EXT4DEV_FS_XATTR

config EXT4_FS_SECURITY

	bool "Ext4 Security Labels"

	depends on EXT4_FS_XATTR

	help

	  Security labels support alternative access control models

	  implemented by security modules like SELinux.  This option

	  enables an extended attribute handler for file security

	  labels in the ext4dev/ext4 filesystem.

	  labels in the ext4 filesystem.



	  If you are not using a security module that requires using

	  extended attributes for file security labels, say N.
@@ -240,22 +254,22 @@ config JBD2 
	help

	  This is a generic journaling layer for block devices that support

	  both 32-bit and 64-bit block numbers.  It is currently used by

	  the ext4dev/ext4 filesystem, but it could also be used to add

	  the ext4 filesystem, but it could also be used to add

	  journal support to other file systems or block devices such

	  as RAID or LVM.



	  If you are using ext4dev/ext4, you need to say Y here. If you are not

	  using ext4dev/ext4 then you will probably want to say N.

	  If you are using ext4, you need to say Y here. If you are not

	  using ext4 then you will probably want to say N.



	  To compile this device as a module, choose M here. The module will be

	  called jbd2.  If you are compiling ext4dev/ext4 into the kernel,

	  called jbd2.  If you are compiling ext4 into the kernel,

	  you cannot compile this code as a module.



config JBD2_DEBUG

	bool "JBD2 (ext4dev/ext4) debugging support"

	bool "JBD2 (ext4) debugging support"

	depends on JBD2 && DEBUG_FS

	help

	  If you are using the ext4dev/ext4 journaled file system (or

	  If you are using the ext4 journaled file system (or

	  potentially any other filesystem/device using JBD2), this option

	  allows you to enable debugging output while the system is running,

	  in order to help track down any problems you are having.
@@ -270,9 +284,9 @@ config JBD2_DEBUG 
config FS_MBCACHE

# Meta block cache for Extended Attributes (ext2/ext3/ext4)

	tristate

	depends on EXT2_FS_XATTR || EXT3_FS_XATTR || EXT4DEV_FS_XATTR

	default y if EXT2_FS=y || EXT3_FS=y || EXT4DEV_FS=y

	default m if EXT2_FS=m || EXT3_FS=m || EXT4DEV_FS=m

	depends on EXT2_FS_XATTR || EXT3_FS_XATTR || EXT4_FS_XATTR

	default y if EXT2_FS=y || EXT3_FS=y || EXT4_FS=y

	default m if EXT2_FS=m || EXT3_FS=m || EXT4_FS=m



config REISERFS_FS

	tristate "Reiserfs support"

fs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ obj-$(CONFIG_DLM) += dlm/ 
# Do not add any filesystems before this line

obj-$(CONFIG_REISERFS_FS)	+= reiserfs/

obj-$(CONFIG_EXT3_FS)		+= ext3/ # Before ext2 so root fs can be ext3

obj-$(CONFIG_EXT4DEV_FS)	+= ext4/ # Before ext2 so root fs can be ext4dev

obj-$(CONFIG_EXT4_FS)		+= ext4/ # Before ext2 so root fs can be ext4dev

obj-$(CONFIG_JBD)		+= jbd/

obj-$(CONFIG_JBD2)		+= jbd2/

obj-$(CONFIG_EXT2_FS)		+= ext2/

fs/ext4/Makefile

+5 −5
Original line number Diff line number Diff line
@@ -2,12 +2,12 @@ 
# Makefile for the linux ext4-filesystem routines.

#



obj-$(CONFIG_EXT4DEV_FS) += ext4dev.o

obj-$(CONFIG_EXT4_FS) += ext4.o



ext4dev-y	:= balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \

ext4-y	:= balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \

		   ioctl.o namei.o super.o symlink.o hash.o resize.o extents.o \

		   ext4_jbd2.o migrate.o mballoc.o



ext4dev-$(CONFIG_EXT4DEV_FS_XATTR)	+= xattr.o xattr_user.o xattr_trusted.o

ext4dev-$(CONFIG_EXT4DEV_FS_POSIX_ACL)	+= acl.o

ext4dev-$(CONFIG_EXT4DEV_FS_SECURITY)	+= xattr_security.o
 
ext4-$(CONFIG_EXT4_FS_XATTR)		+= xattr.o xattr_user.o xattr_trusted.o

ext4-$(CONFIG_EXT4_FS_POSIX_ACL)	+= acl.o

ext4-$(CONFIG_EXT4_FS_SECURITY)		+= xattr_security.o

fs/ext4/acl.h

+3 −3
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static inline int ext4_acl_count(size_t size) 
	}

}



#ifdef CONFIG_EXT4DEV_FS_POSIX_ACL

#ifdef CONFIG_EXT4_FS_POSIX_ACL



/* Value for inode->u.ext4_i.i_acl and inode->u.ext4_i.i_default_acl

   if the ACL has not been cached */
@@ -62,7 +62,7 @@ extern int ext4_permission(struct inode *, int); 
extern int ext4_acl_chmod(struct inode *);

extern int ext4_init_acl(handle_t *, struct inode *, struct inode *);



#else  /* CONFIG_EXT4DEV_FS_POSIX_ACL */

#else  /* CONFIG_EXT4_FS_POSIX_ACL */

#include <linux/sched.h>

#define ext4_permission NULL
@@ -77,5 +77,5 @@ ext4_init_acl(handle_t *handle, struct inode *inode, struct inode *dir) 
{

	return 0;

}

#endif  /* CONFIG_EXT4DEV_FS_POSIX_ACL */

#endif  /* CONFIG_EXT4_FS_POSIX_ACL */