diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-28 15:59:05 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-28 15:59:05 -0400 |
| commit | 6784725ab0b9473ce44bfad91a256bd72b5cddc1 (patch) | |
| tree | f31e2bfc4795c2ee490b0eb9fb752be58060568f /Documentation/block | |
| parent | 554828ee0db41618d101d9549db8808af9fd9d65 (diff) | |
| parent | 47be61845c775643f1aa4d2a54343549f943c94c (diff) | |
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs updates from Al Viro:
"Assorted cleanups and fixes.
Probably the most interesting part long-term is ->d_init() - that will
have a bunch of followups in (at least) ceph and lustre, but we'll
need to sort the barrier-related rules before it can get used for
really non-trivial stuff.
Another fun thing is the merge of ->d_iput() callers (dentry_iput()
and dentry_unlink_inode()) and a bunch of ->d_compare() ones (all
except the one in __d_lookup_lru())"
* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (26 commits)
fs/dcache.c: avoid soft-lockup in dput()
vfs: new d_init method
vfs: Update lookup_dcache() comment
bdev: get rid of ->bd_inodes
Remove last traces of ->sync_page
new helper: d_same_name()
dentry_cmp(): use lockless_dereference() instead of smp_read_barrier_depends()
vfs: clean up documentation
vfs: document ->d_real()
vfs: merge .d_select_inode() into .d_real()
unify dentry_iput() and dentry_unlink_inode()
binfmt_misc: ->s_root is not going anywhere
drop redundant ->owner initializations
ufs: get rid of redundant checks
orangefs: constify inode_operations
missed comment updates from ->direct_IO() prototype change
file_inode(f)->i_mapping is f->f_mapping
trim fsnotify hooks a bit
9p: new helper - v9fs_parent_fid()
debugfs: ->d_parent is never NULL or negative
...
Diffstat (limited to 'Documentation/block')
| -rw-r--r-- | Documentation/block/biodoc.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/block/biodoc.txt b/Documentation/block/biodoc.txt index 5be8a7f4cc7f..026d13362aca 100644 --- a/Documentation/block/biodoc.txt +++ b/Documentation/block/biodoc.txt | |||
| @@ -1024,8 +1024,7 @@ could be on demand. For example wait_on_buffer sets the unplugging going | |||
| 1024 | through sync_buffer() running blk_run_address_space(mapping). Or the caller | 1024 | through sync_buffer() running blk_run_address_space(mapping). Or the caller |
| 1025 | can do it explicity through blk_unplug(bdev). So in the read case, | 1025 | can do it explicity through blk_unplug(bdev). So in the read case, |
| 1026 | the queue gets explicitly unplugged as part of waiting for completion on that | 1026 | the queue gets explicitly unplugged as part of waiting for completion on that |
| 1027 | buffer. For page driven IO, the address space ->sync_page() takes care of | 1027 | buffer. |
| 1028 | doing the blk_run_address_space(). | ||
| 1029 | 1028 | ||
| 1030 | Aside: | 1029 | Aside: |
| 1031 | This is kind of controversial territory, as it's not clear if plugging is | 1030 | This is kind of controversial territory, as it's not clear if plugging is |