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

Commit 07f38d97 authored by piaojun's avatar piaojun Committed by Linus Torvalds
Browse files

ocfs2: clean up unused 'page' parameter in ocfs2_write_end_nolock() 

'page' parameter in ocfs2_write_end_nolock() is never used.

Link: http://lkml.kernel.org/r/582FD91A.5000902@huawei.com


Signed-off-by: default avatarJun Piao <piaojun@huawei.com>
Reviewed-by: default avatarJoseph Qi <jiangqi903@gmail.com>
Cc: Mark Fasheh <mfasheh@versity.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 28bb5ef4

fs/ocfs2/aops.c

+3 −4
Original line number Diff line number Diff line
@@ -1950,8 +1950,7 @@ static void ocfs2_write_end_inline(struct inode *inode, loff_t pos, 
}



int ocfs2_write_end_nolock(struct address_space *mapping,

			   loff_t pos, unsigned len, unsigned copied,

			   struct page *page, void *fsdata)

			   loff_t pos, unsigned len, unsigned copied, void *fsdata)

{

	int i, ret;

	unsigned from, to, start = pos & (PAGE_SIZE - 1);
@@ -2064,7 +2063,7 @@ static int ocfs2_write_end(struct file *file, struct address_space *mapping, 
	int ret;

	struct inode *inode = mapping->host;



	ret = ocfs2_write_end_nolock(mapping, pos, len, copied, page, fsdata);

	ret = ocfs2_write_end_nolock(mapping, pos, len, copied, fsdata);



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

	ocfs2_inode_unlock(inode, 1);
@@ -2241,7 +2240,7 @@ static int ocfs2_dio_get_block(struct inode *inode, sector_t iblock, 
		dwc->dw_zero_count++;

	}



	ret = ocfs2_write_end_nolock(inode->i_mapping, pos, len, len, NULL, wc);

	ret = ocfs2_write_end_nolock(inode->i_mapping, pos, len, len, wc);

	BUG_ON(ret != len);

	ret = 0;

unlock:

fs/ocfs2/aops.h

+1 −2
Original line number Diff line number Diff line
@@ -44,8 +44,7 @@ int walk_page_buffers( handle_t *handle, 
					struct buffer_head *bh));



int ocfs2_write_end_nolock(struct address_space *mapping,

			   loff_t pos, unsigned len, unsigned copied,

			   struct page *page, void *fsdata);

			   loff_t pos, unsigned len, unsigned copied, void *fsdata);



typedef enum {

	OCFS2_WRITE_BUFFER = 0,

fs/ocfs2/mmap.c

+1 −2
Original line number Diff line number Diff line
@@ -120,8 +120,7 @@ static int __ocfs2_page_mkwrite(struct file *file, struct buffer_head *di_bh, 
		ret = VM_FAULT_NOPAGE;

		goto out;

	}

	ret = ocfs2_write_end_nolock(mapping, pos, len, len, locked_page,

				     fsdata);

	ret = ocfs2_write_end_nolock(mapping, pos, len, len, fsdata);

	BUG_ON(ret != len);

	ret = VM_FAULT_LOCKED;

out: