Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit adcadfa8 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by Miklos Szeredi
Browse files

fuse: Getting file for writeback helper 



There will be a .writepageS callback implementation which will need to
get a fuse_file out of a fuse_inode, thus make a helper for this.

Signed-off-by: default avatarMaxim Patlasov <MPatlasov@parallels.com>
Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
parent 698fa1d1

fs/fuse/file.c

+16 −8
Original line number Diff line number Diff line
@@ -1494,6 +1494,20 @@ static void fuse_writepage_end(struct fuse_conn *fc, struct fuse_req *req) 
	fuse_writepage_free(fc, req);

}



static struct fuse_file *fuse_write_file(struct fuse_conn *fc,

					 struct fuse_inode *fi)

{

	struct fuse_file *ff;



	spin_lock(&fc->lock);

	BUG_ON(list_empty(&fi->write_files));

	ff = list_entry(fi->write_files.next, struct fuse_file, write_entry);

	fuse_file_get(ff);

	spin_unlock(&fc->lock);



	return ff;

}



static int fuse_writepage_locked(struct page *page)

{

	struct address_space *mapping = page->mapping;
@@ -1501,7 +1515,6 @@ static int fuse_writepage_locked(struct page *page) 
	struct fuse_conn *fc = get_fuse_conn(inode);

	struct fuse_inode *fi = get_fuse_inode(inode);

	struct fuse_req *req;

	struct fuse_file *ff;

	struct page *tmp_page;



	set_page_writeback(page);
@@ -1515,13 +1528,8 @@ static int fuse_writepage_locked(struct page *page) 
	if (!tmp_page)

		goto err_free;



	spin_lock(&fc->lock);

	BUG_ON(list_empty(&fi->write_files));

	ff = list_entry(fi->write_files.next, struct fuse_file, write_entry);

	req->ff = fuse_file_get(ff);

	spin_unlock(&fc->lock);



	fuse_write_fill(req, ff, page_offset(page), 0);

	req->ff = fuse_write_file(fc, fi);

	fuse_write_fill(req, req->ff, page_offset(page), 0);



	copy_highpage(tmp_page, page);

	req->misc.write.in.write_flags |= FUSE_WRITE_CACHE;