fuse: Prepare to handle multiple pages in writeback
The .writepages callback will issue writeback requests with more than one page aboard. Make existing end/check code be aware of this. Signed-off-by: Maxim Patlasov <MPatlasov@parallels.com> Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
This commit is contained in:
parent
adcadfa8f3
commit
385b126815
|
@ -334,7 +334,8 @@ static bool fuse_page_is_writeback(struct inode *inode, pgoff_t index)
|
||||||
|
|
||||||
BUG_ON(req->inode != inode);
|
BUG_ON(req->inode != inode);
|
||||||
curr_index = req->misc.write.in.offset >> PAGE_CACHE_SHIFT;
|
curr_index = req->misc.write.in.offset >> PAGE_CACHE_SHIFT;
|
||||||
if (curr_index == index) {
|
if (curr_index <= index &&
|
||||||
|
index < curr_index + req->num_pages) {
|
||||||
found = true;
|
found = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -1409,7 +1410,10 @@ static ssize_t fuse_direct_write(struct file *file, const char __user *buf,
|
||||||
|
|
||||||
static void fuse_writepage_free(struct fuse_conn *fc, struct fuse_req *req)
|
static void fuse_writepage_free(struct fuse_conn *fc, struct fuse_req *req)
|
||||||
{
|
{
|
||||||
__free_page(req->pages[0]);
|
int i;
|
||||||
|
|
||||||
|
for (i = 0; i < req->num_pages; i++)
|
||||||
|
__free_page(req->pages[i]);
|
||||||
fuse_file_put(req->ff, false);
|
fuse_file_put(req->ff, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1418,11 +1422,14 @@ static void fuse_writepage_finish(struct fuse_conn *fc, struct fuse_req *req)
|
||||||
struct inode *inode = req->inode;
|
struct inode *inode = req->inode;
|
||||||
struct fuse_inode *fi = get_fuse_inode(inode);
|
struct fuse_inode *fi = get_fuse_inode(inode);
|
||||||
struct backing_dev_info *bdi = inode->i_mapping->backing_dev_info;
|
struct backing_dev_info *bdi = inode->i_mapping->backing_dev_info;
|
||||||
|
int i;
|
||||||
|
|
||||||
list_del(&req->writepages_entry);
|
list_del(&req->writepages_entry);
|
||||||
dec_bdi_stat(bdi, BDI_WRITEBACK);
|
for (i = 0; i < req->num_pages; i++) {
|
||||||
dec_zone_page_state(req->pages[0], NR_WRITEBACK_TEMP);
|
dec_bdi_stat(bdi, BDI_WRITEBACK);
|
||||||
bdi_writeout_inc(bdi);
|
dec_zone_page_state(req->pages[i], NR_WRITEBACK_TEMP);
|
||||||
|
bdi_writeout_inc(bdi);
|
||||||
|
}
|
||||||
wake_up(&fi->page_waitq);
|
wake_up(&fi->page_waitq);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1434,14 +1441,15 @@ __acquires(fc->lock)
|
||||||
struct fuse_inode *fi = get_fuse_inode(req->inode);
|
struct fuse_inode *fi = get_fuse_inode(req->inode);
|
||||||
loff_t size = i_size_read(req->inode);
|
loff_t size = i_size_read(req->inode);
|
||||||
struct fuse_write_in *inarg = &req->misc.write.in;
|
struct fuse_write_in *inarg = &req->misc.write.in;
|
||||||
|
__u64 data_size = req->num_pages * PAGE_CACHE_SIZE;
|
||||||
|
|
||||||
if (!fc->connected)
|
if (!fc->connected)
|
||||||
goto out_free;
|
goto out_free;
|
||||||
|
|
||||||
if (inarg->offset + PAGE_CACHE_SIZE <= size) {
|
if (inarg->offset + data_size <= size) {
|
||||||
inarg->size = PAGE_CACHE_SIZE;
|
inarg->size = data_size;
|
||||||
} else if (inarg->offset < size) {
|
} else if (inarg->offset < size) {
|
||||||
inarg->size = size & (PAGE_CACHE_SIZE - 1);
|
inarg->size = size - inarg->offset;
|
||||||
} else {
|
} else {
|
||||||
/* Got truncated off completely */
|
/* Got truncated off completely */
|
||||||
goto out_free;
|
goto out_free;
|
||||||
|
|
Loading…
Reference in New Issue