diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /Documentation/filesystems/ext3.txt | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
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 |