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

Commit 0378da0f authored by Tao Ma's avatar Tao Ma
Browse files

ocfs2: pass struct file* to ocfs2_write_begin_nolock. 



struct file * has file_ra_state to store the readahead state
and data. So pass this to ocfs2_write_begin_nolock so that
it can be used in ocfs2_refcount_cow.

Signed-off-by: default avatarTao Ma <tao.ma@oracle.com>
parent 5af568cb

fs/ocfs2/aops.c

+3 −2
Original line number Diff line number Diff line
@@ -1642,7 +1642,8 @@ static int ocfs2_zero_tail(struct inode *inode, struct buffer_head *di_bh, 
	return ret;

}



int ocfs2_write_begin_nolock(struct address_space *mapping,

int ocfs2_write_begin_nolock(struct file *filp,

			     struct address_space *mapping,

			     loff_t pos, unsigned len, unsigned flags,

			     struct page **pagep, void **fsdata,

			     struct buffer_head *di_bh, struct page *mmap_page)
@@ -1854,7 +1855,7 @@ static int ocfs2_write_begin(struct file *file, struct address_space *mapping, 
	 */

	down_write(&OCFS2_I(inode)->ip_alloc_sem);



	ret = ocfs2_write_begin_nolock(mapping, pos, len, flags, pagep,

	ret = ocfs2_write_begin_nolock(file, mapping, pos, len, flags, pagep,

				       fsdata, di_bh, NULL);

	if (ret) {

		mlog_errno(ret);

fs/ocfs2/aops.h

+2 −1
Original line number Diff line number Diff line
@@ -48,7 +48,8 @@ int ocfs2_write_end_nolock(struct address_space *mapping, 
			   loff_t pos, unsigned len, unsigned copied,

			   struct page *page, void *fsdata);



int ocfs2_write_begin_nolock(struct address_space *mapping,

int ocfs2_write_begin_nolock(struct file *filp,

			     struct address_space *mapping,

			     loff_t pos, unsigned len, unsigned flags,

			     struct page **pagep, void **fsdata,

			     struct buffer_head *di_bh, struct page *mmap_page);

fs/ocfs2/mmap.c

+4 −3
Original line number Diff line number Diff line
@@ -59,10 +59,11 @@ static int ocfs2_fault(struct vm_area_struct *area, struct vm_fault *vmf) 
	return ret;

}



static int __ocfs2_page_mkwrite(struct inode *inode, struct buffer_head *di_bh,

static int __ocfs2_page_mkwrite(struct file *file, struct buffer_head *di_bh,

				struct page *page)

{

	int ret;

	struct inode *inode = file->f_path.dentry->d_inode;

	struct address_space *mapping = inode->i_mapping;

	loff_t pos = page_offset(page);

	unsigned int len = PAGE_CACHE_SIZE;
@@ -109,7 +110,7 @@ static int __ocfs2_page_mkwrite(struct inode *inode, struct buffer_head *di_bh, 
	if (page->index == last_index)

		len = size & ~PAGE_CACHE_MASK;



	ret = ocfs2_write_begin_nolock(mapping, pos, len, 0, &locked_page,

	ret = ocfs2_write_begin_nolock(file, mapping, pos, len, 0, &locked_page,

				       &fsdata, di_bh, page);

	if (ret) {

		if (ret != -ENOSPC)
@@ -157,7 +158,7 @@ static int ocfs2_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) 
	 */

	down_write(&OCFS2_I(inode)->ip_alloc_sem);



	ret = __ocfs2_page_mkwrite(inode, di_bh, page);

	ret = __ocfs2_page_mkwrite(vma->vm_file, di_bh, page);



	up_write(&OCFS2_I(inode)->ip_alloc_sem);