diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-12 17:49:50 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-12 17:49:50 -0400 |
commit | 5166701b368caea89d57b14bf41cf39e819dad51 (patch) | |
tree | c73b9d4860809e3afa9359be9d03ba2d8d98a18e /fs/buffer.c | |
parent | 0a7418f5f569512e98789c439198eed4b507cce3 (diff) | |
parent | a786c06d9f2719203c00b3d97b21f9a96980d0b5 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs updates from Al Viro:
"The first vfs pile, with deep apologies for being very late in this
window.
Assorted cleanups and fixes, plus a large preparatory part of iov_iter
work. There's a lot more of that, but it'll probably go into the next
merge window - it *does* shape up nicely, removes a lot of
boilerplate, gets rid of locking inconsistencie between aio_write and
splice_write and I hope to get Kent's direct-io rewrite merged into
the same queue, but some of the stuff after this point is having
(mostly trivial) conflicts with the things already merged into
mainline and with some I want more testing.
This one passes LTP and xfstests without regressions, in addition to
usual beating. BTW, readahead02 in ltp syscalls testsuite has started
giving failures since "mm/readahead.c: fix readahead failure for
memoryless NUMA nodes and limit readahead pages" - might be a false
positive, might be a real regression..."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (63 commits)
missing bits of "splice: fix racy pipe->buffers uses"
cifs: fix the race in cifs_writev()
ceph_sync_{,direct_}write: fix an oops on ceph_osdc_new_request() failure
kill generic_file_buffered_write()
ocfs2_file_aio_write(): switch to generic_perform_write()
ceph_aio_write(): switch to generic_perform_write()
xfs_file_buffered_aio_write(): switch to generic_perform_write()
export generic_perform_write(), start getting rid of generic_file_buffer_write()
generic_file_direct_write(): get rid of ppos argument
btrfs_file_aio_write(): get rid of ppos
kill the 5th argument of generic_file_buffered_write()
kill the 4th argument of __generic_file_aio_write()
lustre: don't open-code kernel_recvmsg()
ocfs2: don't open-code kernel_recvmsg()
drbd: don't open-code kernel_recvmsg()
constify blk_rq_map_user_iov() and friends
lustre: switch to kernel_sendmsg()
ocfs2: don't open-code kernel_sendmsg()
take iov_iter stuff to mm/iov_iter.c
process_vm_access: tidy up a bit
...
Diffstat (limited to 'fs/buffer.c')
-rw-r--r-- | fs/buffer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index 8c53a2b15ecb..9ddb9fc7d923 100644 --- a/fs/buffer.c +++ b/fs/buffer.c | |||
@@ -2114,8 +2114,8 @@ EXPORT_SYMBOL(generic_write_end); | |||
2114 | * Returns true if all buffers which correspond to a file portion | 2114 | * Returns true if all buffers which correspond to a file portion |
2115 | * we want to read are uptodate. | 2115 | * we want to read are uptodate. |
2116 | */ | 2116 | */ |
2117 | int block_is_partially_uptodate(struct page *page, read_descriptor_t *desc, | 2117 | int block_is_partially_uptodate(struct page *page, unsigned long from, |
2118 | unsigned long from) | 2118 | unsigned long count) |
2119 | { | 2119 | { |
2120 | unsigned block_start, block_end, blocksize; | 2120 | unsigned block_start, block_end, blocksize; |
2121 | unsigned to; | 2121 | unsigned to; |
@@ -2127,7 +2127,7 @@ int block_is_partially_uptodate(struct page *page, read_descriptor_t *desc, | |||
2127 | 2127 | ||
2128 | head = page_buffers(page); | 2128 | head = page_buffers(page); |
2129 | blocksize = head->b_size; | 2129 | blocksize = head->b_size; |
2130 | to = min_t(unsigned, PAGE_CACHE_SIZE - from, desc->count); | 2130 | to = min_t(unsigned, PAGE_CACHE_SIZE - from, count); |
2131 | to = from + to; | 2131 | to = from + to; |
2132 | if (from < blocksize && to > PAGE_CACHE_SIZE - blocksize) | 2132 | if (from < blocksize && to > PAGE_CACHE_SIZE - blocksize) |
2133 | return 0; | 2133 | return 0; |