summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-02-04 01:52:44 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-02-04 01:52:44 +0100
commitf96c08e8c5935d80bb9fd48c61b5bfa00878519e (patch)
treef0e34c84ce69a9e076c23299c94f0fd583a568e0 /Documentation
parentMerge master.kernel.org:/home/rmk/linux-2.6-arm (diff)
parentUBIFS: remove fast unmounting (diff)
downloadlinux-f96c08e8c5935d80bb9fd48c61b5bfa00878519e.tar.xz
linux-f96c08e8c5935d80bb9fd48c61b5bfa00878519e.zip
Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
* 'linux-next' of git://git.infradead.org/ubifs-2.6: UBIFS: remove fast unmounting UBIFS: return sensible error codes UBIFS: remount ro fixes UBIFS: spelling fix 'date' -> 'data' UBIFS: sync wbufs after syncing inodes and pages UBIFS: fix LPT out-of-space bug (again) UBIFS: fix no_chk_data_crc UBIFS: fix assertions UBIFS: ensure orphan area head is initialized UBIFS: always clean up GC LEB space UBIFS: add re-mount debugging checks UBIFS: fix LEB list freeing UBIFS: simplify locking UBIFS: document dark_wm and dead_wm better UBIFS: do not treat all data as short term UBIFS: constify operations UBIFS: do not commit twice
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/filesystems/ubifs.txt7
1 files changed, 0 insertions, 7 deletions
diff --git a/Documentation/filesystems/ubifs.txt b/Documentation/filesystems/ubifs.txt
index 84da2a4ba25a..12fedb7834c6 100644
--- a/Documentation/filesystems/ubifs.txt
+++ b/Documentation/filesystems/ubifs.txt
@@ -79,13 +79,6 @@ Mount options
(*) == default.
-norm_unmount (*) commit on unmount; the journal is committed
- when the file-system is unmounted so that the
- next mount does not have to replay the journal
- and it becomes very fast;
-fast_unmount do not commit on unmount; this option makes
- unmount faster, but the next mount slower
- because of the need to replay the journal.
bulk_read read more in one go to take advantage of flash
media that read faster sequentially
no_bulk_read (*) do not bulk-read