summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-02-02 21:16:54 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2014-04-01 23:19:19 -0400
commitc186afb4dbd0050a537b96c7fbee2dba3b57fc38 (patch)
tree4e9f43b3ba20ffbecf8440250a17e1507d53ec5f /fs
parentfbb32750a62df75d1ffea547f3908b21c5496d9f (diff)
downloadop-kernel-dev-c186afb4dbd0050a537b96c7fbee2dba3b57fc38.zip
op-kernel-dev-c186afb4dbd0050a537b96c7fbee2dba3b57fc38.tar.gz
switch ->is_partially_uptodate() to saner arguments
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/buffer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/buffer.c b/fs/buffer.c
index 27265a8..027ae3b 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -2114,8 +2114,8 @@ EXPORT_SYMBOL(generic_write_end);
* Returns true if all buffers which correspond to a file portion
* we want to read are uptodate.
*/
-int block_is_partially_uptodate(struct page *page, read_descriptor_t *desc,
- unsigned long from)
+int block_is_partially_uptodate(struct page *page, unsigned long from,
+ unsigned long count)
{
unsigned block_start, block_end, blocksize;
unsigned to;
@@ -2127,7 +2127,7 @@ int block_is_partially_uptodate(struct page *page, read_descriptor_t *desc,
head = page_buffers(page);
blocksize = head->b_size;
- to = min_t(unsigned, PAGE_CACHE_SIZE - from, desc->count);
+ to = min_t(unsigned, PAGE_CACHE_SIZE - from, count);
to = from + to;
if (from < blocksize && to > PAGE_CACHE_SIZE - blocksize)
return 0;
OpenPOWER on IntegriCloud