diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-11 20:12:17 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-11 20:12:17 -0500 |
| commit | 501706565b2d4d2d40d0d301d5411ede099b8a6f (patch) | |
| tree | 142a18bf1f1e74a09dbfa27540b893ade0fd797d /Documentation/filesystems/ext3.txt | |
| parent | e93737b0f0159a61772894943199fd3b6f315641 (diff) | |
| parent | 2fe77b81c77eed92c4c0439f74c8148a295b4a86 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
include/net/tcp.h
Diffstat (limited to 'Documentation/filesystems/ext3.txt')
| -rw-r--r-- | Documentation/filesystems/ext3.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/filesystems/ext3.txt b/Documentation/filesystems/ext3.txt index 05d5cf1d743f..867c5b50cb42 100644 --- a/Documentation/filesystems/ext3.txt +++ b/Documentation/filesystems/ext3.txt | |||
| @@ -32,8 +32,8 @@ journal_dev=devnum When the external journal device's major/minor numbers | |||
| 32 | identified through its new major/minor numbers encoded | 32 | identified through its new major/minor numbers encoded |
| 33 | in devnum. | 33 | in devnum. |
| 34 | 34 | ||
| 35 | noload Don't load the journal on mounting. Note that this forces | 35 | norecovery Don't load the journal on mounting. Note that this forces |
| 36 | mount of inconsistent filesystem, which can lead to | 36 | noload mount of inconsistent filesystem, which can lead to |
| 37 | various problems. | 37 | various problems. |
| 38 | 38 | ||
| 39 | data=journal All data are committed into the journal prior to being | 39 | data=journal All data are committed into the journal prior to being |