Skip to content

L
linux
Commit 596f9494 authored by Nathan Scott's avatar Nathan Scott Committed by Christoph Hellwig
Browse files
Options

[XFS] Fix up a trivial merge botch.

parent 822e10da
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 5 deletions
fs/xfs/linux/xfs_aops.c
View file @ 596f9494
...@@ -718,9 +718,10 @@ xfs_page_state_convert( ...@@ -718,9 +718,10 @@ xfs_page_state_convert(
{ {
struct buffer_head *bh_arr[MAX_BUF_PER_PAGE], *bh, *head; struct buffer_head *bh_arr[MAX_BUF_PER_PAGE], *bh, *head;
xfs_iomap_t *iomp, iomap; xfs_iomap_t *iomp, iomap;
unsigned long p_offset = 0;
pgoff_t end_index; pgoff_t end_index;
unsigned long end_index;
loff_t offset; loff_t offset;
unsigned long long end_offset;
int len, err, i, cnt = 0, uptodate = 1; int len, err, i, cnt = 0, uptodate = 1;
int flags = startio ? 0 : BMAPI_TRYLOCK; int flags = startio ? 0 : BMAPI_TRYLOCK;
int page_dirty = 1; int page_dirty = 1;
......
fs/xfs/linux/xfs_buf.h
View file @ 596f9494
...@@ -296,10 +296,8 @@ extern int pagebuf_ispin( /* check if buffer is pinned */ ...@@ -296,10 +296,8 @@ extern int pagebuf_ispin( /* check if buffer is pinned */
/* Delayed Write Buffer Routines */ /* Delayed Write Buffer Routines */
extern void xfs_buf_delwri_flush(xfs_buftarg_t *, int, int *); extern void pagebuf_delwri_flush(xfs_buftarg_t *, int, int *);
extern void xfs_buf_delwri_dequeue(xfs_buf_t *); extern void pagebuf_delwri_dequeue(xfs_buf_t *);
xfs_buftarg_t *,
unsigned long,
/* Buffer Daemon Setup Routines */ /* Buffer Daemon Setup Routines */
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7