diff options
| author | Nathan Scott <nathans@sgi.com> | 2004-04-22 13:57:18 +1000 |
|---|---|---|
| committer | Christoph Hellwig <hch@sgi.com> | 2004-04-22 13:57:18 +1000 |
| commit | 596f9494c8d5a037ae979b98bc42acc2eed4e59e (patch) | |
| tree | d9605e077fa20f17a6eba871a3a78d833633515d /fs | |
| parent | 822e10dacf8f085b130785024e52ec12f325814e (diff) | |
[XFS] Fix up a trivial merge botch.
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/xfs/linux/xfs_aops.c | 3 | ||||
| -rw-r--r-- | fs/xfs/linux/xfs_buf.h | 6 | ||||
| -rw-r--r-- | fs/xfs/linux/xfs_globals.c | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/fs/xfs/linux/xfs_aops.c b/fs/xfs/linux/xfs_aops.c index 3afd1f80d72f..3afc61d10b1b 100644 --- a/fs/xfs/linux/xfs_aops.c +++ b/fs/xfs/linux/xfs_aops.c @@ -718,9 +718,10 @@ xfs_page_state_convert( { struct buffer_head *bh_arr[MAX_BUF_PER_PAGE], *bh, *head; xfs_iomap_t *iomp, iomap; + unsigned long p_offset = 0; pgoff_t end_index; - unsigned long end_index; loff_t offset; + unsigned long long end_offset; int len, err, i, cnt = 0, uptodate = 1; int flags = startio ? 0 : BMAPI_TRYLOCK; int page_dirty = 1; diff --git a/fs/xfs/linux/xfs_buf.h b/fs/xfs/linux/xfs_buf.h index c7bc2c8b34d9..16becc722551 100644 --- a/fs/xfs/linux/xfs_buf.h +++ b/fs/xfs/linux/xfs_buf.h @@ -296,10 +296,8 @@ extern int pagebuf_ispin( /* check if buffer is pinned */ /* Delayed Write Buffer Routines */ -extern void xfs_buf_delwri_flush(xfs_buftarg_t *, int, int *); -extern void xfs_buf_delwri_dequeue(xfs_buf_t *); - xfs_buftarg_t *, - unsigned long, +extern void pagebuf_delwri_flush(xfs_buftarg_t *, int, int *); +extern void pagebuf_delwri_dequeue(xfs_buf_t *); /* Buffer Daemon Setup Routines */ diff --git a/fs/xfs/linux/xfs_globals.c b/fs/xfs/linux/xfs_globals.c index 658a0be7abbc..1144a8b9f76d 100644 --- a/fs/xfs/linux/xfs_globals.c +++ b/fs/xfs/linux/xfs_globals.c @@ -50,7 +50,7 @@ unsigned long xfs_physmem; */ xfs_param_t xfs_params = { - /* MIN DFLT MAX */ + /* MIN DFLT MAX */ .restrict_chown = { 0, 1, 1 }, .sgid_inherit = { 0, 0, 1 }, .symlink_mode = { 0, 0, 1 }, |