[XFS] Use the right offset when ensuring a delayed allocate conversion has covered the offset originally requested. Can cause data corruption when multiple processes are performing writeout on different areas of the same file. Quite difficult to hit though.

SGI Modid: xfs-linux:xfs-kern:22377a

Signed-off-by: Nathan Scott <nathans@sgi.com>
Signed-off-by: Christoph Hellwig <hch@sgi.com>
.

1 files changed, 4 insertions, 3 deletions

diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h
index 1b968471ec8b..8ffb65dc110d 100644
--- a/fs/xfs/xfs_mount.h
+++ b/fs/xfs/xfs_mount.h
@@ -216,7 +216,8 @@ typedef int		(*xfs_iomap_write_delay_t)(
                                 void *, loff_t, size_t, int,
                                 struct xfs_bmbt_irec *, int *);
 typedef int             (*xfs_iomap_write_allocate_t)(
-                                void *, struct xfs_bmbt_irec *, int *);
+                                void *, loff_t, size_t,
+                                struct xfs_bmbt_irec *, int *);
 typedef int             (*xfs_iomap_write_unwritten_t)(
                                 void *, loff_t, size_t);
 typedef uint            (*xfs_lck_map_shared_t)(void *);
@@ -258,9 +259,9 @@ typedef struct xfs_ioops {
 #define XFS_IOMAP_WRITE_DELAY(mp, io, offset, count, flags, mval, nmap) \
         (*(mp)->m_io_ops.xfs_iomap_write_delay) \
                 ((io)->io_obj, offset, count, flags, mval, nmap)
-#define XFS_IOMAP_WRITE_ALLOCATE(mp, io, mval, nmap) \
+#define XFS_IOMAP_WRITE_ALLOCATE(mp, io, offset, count, mval, nmap) \
         (*(mp)->m_io_ops.xfs_iomap_write_allocate) \
-                ((io)->io_obj, mval, nmap)
+                ((io)->io_obj, offset, count, mval, nmap)
 #define XFS_IOMAP_WRITE_UNWRITTEN(mp, io, offset, count) \
         (*(mp)->m_io_ops.xfs_iomap_write_unwritten) \
                 ((io)->io_obj, offset, count)