diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-25 14:06:17 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-25 14:06:17 +1100 |
commit | eafe98c7f28f8b944b157680727cd7f17aa7caea (patch) | |
tree | 0b4d79212b25e11a526f60bc02e6d018e2df69f4 /Documentation | |
parent | 0e436769f9a9fde10145f50057909c72c6e83a9a (diff) | |
parent | b15d79b5ce02b2c29ced2787ba0655244fa37b50 (diff) |
Merge remote branch 'ext3/for_next'
Conflicts:
fs/cifs/dir.c
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/filesystems/ext3.txt | 4 | ||||
-rw-r--r-- | Documentation/filesystems/vfs.txt | 2 |
2 files changed, 3 insertions, 3 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 identified through its new major/minor numbers encoded in devnum. -noload Don't load the journal on mounting. Note that this forces - mount of inconsistent filesystem, which can lead to +norecovery Don't load the journal on mounting. Note that this forces +noload mount of inconsistent filesystem, which can lead to various problems. data=journal All data are committed into the journal prior to being diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt index 623f094c9d8d..3de2f32edd90 100644 --- a/Documentation/filesystems/vfs.txt +++ b/Documentation/filesystems/vfs.txt @@ -472,7 +472,7 @@ __sync_single_inode) to check if ->writepages has been successful in writing out the whole address_space. The Writeback tag is used by filemap*wait* and sync_page* functions, -via wait_on_page_writeback_range, to wait for all writeback to +via filemap_fdatawait_range, to wait for all writeback to complete. While waiting ->sync_page (if defined) will be called on each page that is found to require writeback. |