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

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.comSigned-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
...@@ -1950,8 +1950,7 @@ static void ocfs2_write_end_inline(struct inode *inode, loff_t pos, ...@@ -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, int ocfs2_write_end_nolock(struct address_space *mapping,
loff_t pos, unsigned len, unsigned copied, loff_t pos, unsigned len, unsigned copied, void *fsdata)
struct page *page, void *fsdata)
{ {
int i, ret; int i, ret;
unsigned from, to, start = pos & (PAGE_SIZE - 1); unsigned from, to, start = pos & (PAGE_SIZE - 1);
...@@ -2064,7 +2063,7 @@ static int ocfs2_write_end(struct file *file, struct address_space *mapping, ...@@ -2064,7 +2063,7 @@ static int ocfs2_write_end(struct file *file, struct address_space *mapping,
int ret; int ret;
struct inode *inode = mapping->host; 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); up_write(&OCFS2_I(inode)->ip_alloc_sem);
ocfs2_inode_unlock(inode, 1); ocfs2_inode_unlock(inode, 1);
...@@ -2241,7 +2240,7 @@ static int ocfs2_dio_get_block(struct inode *inode, sector_t iblock, ...@@ -2241,7 +2240,7 @@ static int ocfs2_dio_get_block(struct inode *inode, sector_t iblock,
dwc->dw_zero_count++; 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); BUG_ON(ret != len);
ret = 0; ret = 0;
unlock: unlock:
......
...@@ -44,8 +44,7 @@ int walk_page_buffers( handle_t *handle, ...@@ -44,8 +44,7 @@ int walk_page_buffers( handle_t *handle,
struct buffer_head *bh)); struct buffer_head *bh));
int ocfs2_write_end_nolock(struct address_space *mapping, int ocfs2_write_end_nolock(struct address_space *mapping,
loff_t pos, unsigned len, unsigned copied, loff_t pos, unsigned len, unsigned copied, void *fsdata);
struct page *page, void *fsdata);
typedef enum { typedef enum {
OCFS2_WRITE_BUFFER = 0, OCFS2_WRITE_BUFFER = 0,
......
...@@ -120,8 +120,7 @@ static int __ocfs2_page_mkwrite(struct file *file, struct buffer_head *di_bh, ...@@ -120,8 +120,7 @@ static int __ocfs2_page_mkwrite(struct file *file, struct buffer_head *di_bh,
ret = VM_FAULT_NOPAGE; ret = VM_FAULT_NOPAGE;
goto out; goto out;
} }
ret = ocfs2_write_end_nolock(mapping, pos, len, len, locked_page, ret = ocfs2_write_end_nolock(mapping, pos, len, len, fsdata);
fsdata);
BUG_ON(ret != len); BUG_ON(ret != len);
ret = VM_FAULT_LOCKED; ret = VM_FAULT_LOCKED;
out: out:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment