[XFS] Fix up a trivial merge botch.

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;

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 */
 

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	},