Skip to content

Commit c290ea0

Browse files
jankaraJan Kara
authored andcommitted
fs: Remove ext3 filesystem driver
The functionality of ext3 is fully supported by ext4 driver. Major distributions (SUSE, RedHat) already use ext4 driver to handle ext3 filesystems for quite some time. There is some ugliness in mm resulting from jbd cleaning buffers in a dirty page without cleaning page dirty bit and also support for buffer bouncing in the block layer when stable pages are required is there only because of jbd. So let's remove the ext3 driver. This saves us some 28k lines of duplicated code. Acked-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Jan Kara <jack@suse.cz>
1 parent 82ff50b commit c290ea0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+87
-28109
lines changed

Documentation/filesystems/ext2.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -360,8 +360,8 @@ and are copied into the filesystem. If a transaction is incomplete at
360360
the time of the crash, then there is no guarantee of consistency for
361361
the blocks in that transaction so they are discarded (which means any
362362
filesystem changes they represent are also lost).
363-
Check Documentation/filesystems/ext3.txt if you want to read more about
364-
ext3 and journaling.
363+
Check Documentation/filesystems/ext4.txt if you want to read more about
364+
ext4 and journaling.
365365

366366
References
367367
==========

Documentation/filesystems/ext3.txt

Lines changed: 3 additions & 206 deletions
Original file line numberDiff line numberDiff line change
@@ -6,210 +6,7 @@ Ext3 was originally released in September 1999. Written by Stephen Tweedie
66
for the 2.2 branch, and ported to 2.4 kernels by Peter Braam, Andreas Dilger,
77
Andrew Morton, Alexander Viro, Ted Ts'o and Stephen Tweedie.
88

9-
Ext3 is the ext2 filesystem enhanced with journalling capabilities.
9+
Ext3 is the ext2 filesystem enhanced with journalling capabilities. The
10+
filesystem is a subset of ext4 filesystem so use ext4 driver for accessing
11+
ext3 filesystems.
1012

11-
Options
12-
=======
13-
14-
When mounting an ext3 filesystem, the following option are accepted:
15-
(*) == default
16-
17-
ro Mount filesystem read only. Note that ext3 will replay
18-
the journal (and thus write to the partition) even when
19-
mounted "read only". Mount options "ro,noload" can be
20-
used to prevent writes to the filesystem.
21-
22-
journal=update Update the ext3 file system's journal to the current
23-
format.
24-
25-
journal=inum When a journal already exists, this option is ignored.
26-
Otherwise, it specifies the number of the inode which
27-
will represent the ext3 file system's journal file.
28-
29-
journal_path=path
30-
journal_dev=devnum When the external journal device's major/minor numbers
31-
have changed, these options allow the user to specify
32-
the new journal location. The journal device is
33-
identified through either its new major/minor numbers
34-
encoded in devnum, or via a path to the device.
35-
36-
norecovery Don't load the journal on mounting. Note that this forces
37-
noload mount of inconsistent filesystem, which can lead to
38-
various problems.
39-
40-
data=journal All data are committed into the journal prior to being
41-
written into the main file system.
42-
43-
data=ordered (*) All data are forced directly out to the main file
44-
system prior to its metadata being committed to the
45-
journal.
46-
47-
data=writeback Data ordering is not preserved, data may be written
48-
into the main file system after its metadata has been
49-
committed to the journal.
50-
51-
commit=nrsec (*) Ext3 can be told to sync all its data and metadata
52-
every 'nrsec' seconds. The default value is 5 seconds.
53-
This means that if you lose your power, you will lose
54-
as much as the latest 5 seconds of work (your
55-
filesystem will not be damaged though, thanks to the
56-
journaling). This default value (or any low value)
57-
will hurt performance, but it's good for data-safety.
58-
Setting it to 0 will have the same effect as leaving
59-
it at the default (5 seconds).
60-
Setting it to very large values will improve
61-
performance.
62-
63-
barrier=<0|1(*)> This enables/disables the use of write barriers in
64-
barrier (*) the jbd code. barrier=0 disables, barrier=1 enables.
65-
nobarrier This also requires an IO stack which can support
66-
barriers, and if jbd gets an error on a barrier
67-
write, it will disable again with a warning.
68-
Write barriers enforce proper on-disk ordering
69-
of journal commits, making volatile disk write caches
70-
safe to use, at some performance penalty. If
71-
your disks are battery-backed in one way or another,
72-
disabling barriers may safely improve performance.
73-
The mount options "barrier" and "nobarrier" can
74-
also be used to enable or disable barriers, for
75-
consistency with other ext3 mount options.
76-
77-
user_xattr Enables Extended User Attributes. Additionally, you
78-
need to have extended attribute support enabled in the
79-
kernel configuration (CONFIG_EXT3_FS_XATTR). See the
80-
attr(5) manual page and http://acl.bestbits.at/ to
81-
learn more about extended attributes.
82-
83-
nouser_xattr Disables Extended User Attributes.
84-
85-
acl Enables POSIX Access Control Lists support.
86-
Additionally, you need to have ACL support enabled in
87-
the kernel configuration (CONFIG_EXT3_FS_POSIX_ACL).
88-
See the acl(5) manual page and http://acl.bestbits.at/
89-
for more information.
90-
91-
noacl This option disables POSIX Access Control List
92-
support.
93-
94-
reservation
95-
96-
noreservation
97-
98-
bsddf (*) Make 'df' act like BSD.
99-
minixdf Make 'df' act like Minix.
100-
101-
check=none Don't do extra checking of bitmaps on mount.
102-
nocheck
103-
104-
debug Extra debugging information is sent to syslog.
105-
106-
errors=remount-ro Remount the filesystem read-only on an error.
107-
errors=continue Keep going on a filesystem error.
108-
errors=panic Panic and halt the machine if an error occurs.
109-
(These mount options override the errors behavior
110-
specified in the superblock, which can be
111-
configured using tune2fs.)
112-
113-
data_err=ignore(*) Just print an error message if an error occurs
114-
in a file data buffer in ordered mode.
115-
data_err=abort Abort the journal if an error occurs in a file
116-
data buffer in ordered mode.
117-
118-
grpid Give objects the same group ID as their creator.
119-
bsdgroups
120-
121-
nogrpid (*) New objects have the group ID of their creator.
122-
sysvgroups
123-
124-
resgid=n The group ID which may use the reserved blocks.
125-
126-
resuid=n The user ID which may use the reserved blocks.
127-
128-
sb=n Use alternate superblock at this location.
129-
130-
quota These options are ignored by the filesystem. They
131-
noquota are used only by quota tools to recognize volumes
132-
grpquota where quota should be turned on. See documentation
133-
usrquota in the quota-tools package for more details
134-
(http://sourceforge.net/projects/linuxquota).
135-
136-
jqfmt=<quota type> These options tell filesystem details about quota
137-
usrjquota=<file> so that quota information can be properly updated
138-
grpjquota=<file> during journal replay. They replace the above
139-
quota options. See documentation in the quota-tools
140-
package for more details
141-
(http://sourceforge.net/projects/linuxquota).
142-
143-
Specification
144-
=============
145-
Ext3 shares all disk implementation with the ext2 filesystem, and adds
146-
transactions capabilities to ext2. Journaling is done by the Journaling Block
147-
Device layer.
148-
149-
Journaling Block Device layer
150-
-----------------------------
151-
The Journaling Block Device layer (JBD) isn't ext3 specific. It was designed
152-
to add journaling capabilities to a block device. The ext3 filesystem code
153-
will inform the JBD of modifications it is performing (called a transaction).
154-
The journal supports the transactions start and stop, and in case of a crash,
155-
the journal can replay the transactions to quickly put the partition back into
156-
a consistent state.
157-
158-
Handles represent a single atomic update to a filesystem. JBD can handle an
159-
external journal on a block device.
160-
161-
Data Mode
162-
---------
163-
There are 3 different data modes:
164-
165-
* writeback mode
166-
In data=writeback mode, ext3 does not journal data at all. This mode provides
167-
a similar level of journaling as that of XFS, JFS, and ReiserFS in its default
168-
mode - metadata journaling. A crash+recovery can cause incorrect data to
169-
appear in files which were written shortly before the crash. This mode will
170-
typically provide the best ext3 performance.
171-
172-
* ordered mode
173-
In data=ordered mode, ext3 only officially journals metadata, but it logically
174-
groups metadata and data blocks into a single unit called a transaction. When
175-
it's time to write the new metadata out to disk, the associated data blocks
176-
are written first. In general, this mode performs slightly slower than
177-
writeback but significantly faster than journal mode.
178-
179-
* journal mode
180-
data=journal mode provides full data and metadata journaling. All new data is
181-
written to the journal first, and then to its final location.
182-
In the event of a crash, the journal can be replayed, bringing both data and
183-
metadata into a consistent state. This mode is the slowest except when data
184-
needs to be read from and written to disk at the same time where it
185-
outperforms all other modes.
186-
187-
Compatibility
188-
-------------
189-
190-
Ext2 partitions can be easily convert to ext3, with `tune2fs -j <dev>`.
191-
Ext3 is fully compatible with Ext2. Ext3 partitions can easily be mounted as
192-
Ext2.
193-
194-
195-
External Tools
196-
==============
197-
See manual pages to learn more.
198-
199-
tune2fs: create a ext3 journal on a ext2 partition with the -j flag.
200-
mke2fs: create a ext3 partition with the -j flag.
201-
debugfs: ext2 and ext3 file system debugger.
202-
ext2online: online (mounted) ext2 and ext3 filesystem resizer
203-
204-
205-
References
206-
==========
207-
208-
kernel source: <file:fs/ext3/>
209-
<file:fs/jbd/>
210-
211-
programs: http://e2fsprogs.sourceforge.net/
212-
http://ext2resize.sourceforge.net
213-
214-
useful links: http://www.ibm.com/developerworks/library/l-fs7/index.html
215-
http://www.ibm.com/developerworks/library/l-fs8/index.html

Documentation/filesystems/vfs.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,7 @@ struct address_space_operations {
769769
to stall to allow flushers a chance to complete some IO. Ordinarily
770770
it can use PageDirty and PageWriteback but some filesystems have
771771
more complex state (unstable pages in NFS prevent reclaim) or
772-
do not set those flags due to locking problems (jbd). This callback
772+
do not set those flags due to locking problems. This callback
773773
allows a filesystem to indicate to the VM if a page should be
774774
treated as dirty or writeback for the purposes of stalling.
775775

MAINTAINERS

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4059,15 +4059,6 @@ F: Documentation/filesystems/ext2.txt
40594059
F: fs/ext2/
40604060
F: include/linux/ext2*
40614061

4062-
EXT3 FILE SYSTEM
4063-
M: Jan Kara <jack@suse.com>
4064-
M: Andrew Morton <akpm@linux-foundation.org>
4065-
M: Andreas Dilger <adilger.kernel@dilger.ca>
4066-
L: linux-ext4@vger.kernel.org
4067-
S: Maintained
4068-
F: Documentation/filesystems/ext3.txt
4069-
F: fs/ext3/
4070-
40714062
EXT4 FILE SYSTEM
40724063
M: "Theodore Ts'o" <tytso@mit.edu>
40734064
M: Andreas Dilger <adilger.kernel@dilger.ca>
@@ -5751,16 +5742,9 @@ S: Maintained
57515742
F: fs/jffs2/
57525743
F: include/uapi/linux/jffs2.h
57535744

5754-
JOURNALLING LAYER FOR BLOCK DEVICES (JBD)
5755-
M: Andrew Morton <akpm@linux-foundation.org>
5756-
M: Jan Kara <jack@suse.com>
5757-
L: linux-ext4@vger.kernel.org
5758-
S: Maintained
5759-
F: fs/jbd/
5760-
F: include/linux/jbd.h
5761-
57625745
JOURNALLING LAYER FOR BLOCK DEVICES (JBD2)
57635746
M: "Theodore Ts'o" <tytso@mit.edu>
5747+
M: Jan Kara <jack@suse.com>
57645748
L: linux-ext4@vger.kernel.org
57655749
S: Maintained
57665750
F: fs/jbd2/

fs/Kconfig

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,15 @@ config DCACHE_WORD_ACCESS
1111
if BLOCK
1212

1313
source "fs/ext2/Kconfig"
14-
source "fs/ext3/Kconfig"
1514
source "fs/ext4/Kconfig"
16-
source "fs/jbd/Kconfig"
1715
source "fs/jbd2/Kconfig"
1816

1917
config FS_MBCACHE
2018
# Meta block cache for Extended Attributes (ext2/ext3/ext4)
2119
tristate
2220
default y if EXT2_FS=y && EXT2_FS_XATTR
23-
default y if EXT3_FS=y && EXT3_FS_XATTR
2421
default y if EXT4_FS=y
25-
default m if EXT2_FS_XATTR || EXT3_FS_XATTR || EXT4_FS
22+
default m if EXT2_FS_XATTR || EXT4_FS
2623

2724
source "fs/reiserfs/Kconfig"
2825
source "fs/jfs/Kconfig"

fs/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,10 @@ obj-$(CONFIG_DLM) += dlm/
6262
# Do not add any filesystems before this line
6363
obj-$(CONFIG_FSCACHE) += fscache/
6464
obj-$(CONFIG_REISERFS_FS) += reiserfs/
65-
obj-$(CONFIG_EXT3_FS) += ext3/ # Before ext2 so root fs can be ext3
6665
obj-$(CONFIG_EXT2_FS) += ext2/
6766
# We place ext4 after ext2 so plain ext2 root fs's are mounted using ext2
6867
# unless explicitly requested by rootfstype
6968
obj-$(CONFIG_EXT4_FS) += ext4/
70-
obj-$(CONFIG_JBD) += jbd/
7169
obj-$(CONFIG_JBD2) += jbd2/
7270
obj-$(CONFIG_CRAMFS) += cramfs/
7371
obj-$(CONFIG_SQUASHFS) += squashfs/

fs/ext3/Kconfig

Lines changed: 0 additions & 89 deletions
This file was deleted.

0 commit comments

Comments
 (0)