Fix SEGV when using the xfs_io mwrite command

Merge of master-melb:xfs-cmds:27991a by kenmcd.

  Update changes history

diff --git a/doc/CHANGES b/doc/CHANGES
index 47c0ec08aaeb52c88058878f9ac315468c2828d1..9691a69a84300ca840164c70d588faf18591446a 100644 (file)
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,10 @@
-xfsprogs-2.8.17 (8 December 2006)
+xfsprogs-2.8.x (25 January 2007)
+       - Fix pthread stack size setting in xfs_repair.
+       - Fix xfs_bmap -n option displaying a truncated extent.
+       - Fix xfs_io mwrite segfault. Thanks to Utako Kusaka for these two
+         fixes.
+
+xfsprogs-2.8.18 (8 December 2006)
        - <xfs/list.h> is an installed file, we cannot simply rename it,
          as other applications using it (accidentally or not) may break.
          The xfs_list.h name was inconsistent with everything else too.
@@ -15,7 +21,7 @@ xfsprogs-2.8.17 (8 December 2006)
 xfsprogs-2.8.17 (?)
        - Fix up libxfs SEGV when attempting to mount a non-XFS filesystem.
          Thanks to Utako Kusaka <utako@tnes.nec.co.jp> for this.
-       - Fix up xfs_repair aborting if it finds an inode with an invalid 
+       - Fix up xfs_repair aborting if it finds an inode with an invalid
          inode type.
        - Fix up default realtime extent size for large block sizes.
        - Rename include/list.h to xfs_list.h so that other applications
@@ -23,12 +29,12 @@ xfsprogs-2.8.17 (?)
 
 xfsprogs-2.8.16 (30 October 2006)
        - Fix up an endian problem for nlink setting in phase 7 for xfs_repair.
-       
+
 xfsprogs-2.8.15 (19 October 2006)
        - Fix up nlink checks and repairs in phase 7 for xfs_repair.
        - Remove a bogus LEAFN warning for a single leaf node v2 dir.
          Thanks to Roger Willcocks <roger@filmlight.ltd.uk> for this.
-       
+
 xfsprogs-2.8.14 (6 October 2006)
        - Fix up the ring command in xfs_db,
          Thanks to Utako Kusaka <utako@tnes.nec.co.jp> for this.
@@ -523,7 +529,7 @@ xfsprogs-2.5.11 (10 October 2003)
          include files from Linux 2.6.0-test5 onward.
 
 xfsprogs-2.5.10 (30 September 2003)
-       - Fix up xfs_logprint to handle version 2 logs for its 
+       - Fix up xfs_logprint to handle version 2 logs for its
          operation output (previously core dumped on it).
 
 xfsprogs-2.5.9 (19 September 2003)
@@ -843,7 +849,7 @@ xfsprogs-2.1.0 (14 June 2002)
 
 xfsprogs-2.0.6 (30 May 2002)
        - Fix error returns from log recovery (affects xfs_repair).
-       - Fix the way mkfs.xfs round downs the device when the last 
+       - Fix the way mkfs.xfs round downs the device when the last
          AG is smaller than the minimum AG size.
        - Fix bug in xfs_repair da_write() routine, which affects
          filesystems where the data blocksize != naming blocksize
@@ -853,12 +859,12 @@ xfsprogs-2.0.6 (30 May 2002)
        - Add checks of the ACL permissions field into xfs_repair.
 
 xfsprogs-2.0.5 (02 May 2002)
-       - Size AGs so that they do not always start on the same 
+       - Size AGs so that they do not always start on the same
          part of a striped disk
        - Fix an off-by-one error on rounding down an AG that is
          too small to be an AG
        - Don't auto-grow the log to be larger than an AG
-       - Change the error philosophy for -d su=,sw= away from forcing 
+       - Change the error philosophy for -d su=,sw= away from forcing
          the XFS stripe size to match the volume manager stripe size
          and instead accept, with a warning, the stripe unit & width
          supplied on the commandline.
@@ -877,7 +883,7 @@ xfsprogs-2.0.3 (13 April 2002)
 
 xfsprogs-2.0.2 (04 April 2002)
        - Bumped version of libhandle to libhandle.so.1.0.1
-         This changes open_by_handle() and friends so that 
+         This changes open_by_handle() and friends so that
          O_LARGEFILE is added to the open flags.
          This allows xfsdump to dump files greater than
          2^31-1 bytes instead of not dumping the large

diff --git a/io/mmap.c b/io/mmap.c
index c3aa88459049cf402d007fa9dc4efc6f7828c278..5802f71b8e2bf78cf78479a1a0a54c4de4eb3f8a 100644 (file)
--- a/io/mmap.c
+++ b/io/mmap.c
@@ -562,6 +562,7 @@ mwrite_f(
        if (!start)
                return 0;
 
+       offset -= mapping->offset;
        if (rflag) {
                for (tmp = offset + length -1; tmp >= offset; tmp--)
                        ((char *)mapping->addr)[tmp] = seed;