[folded] reiserfs-truncate-blocks-not-used-by-a-write-v2-fix.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     reiserfs-truncate-blocks-not-used-by-a-write-v2-fix
has been removed from the -mm tree.  Its filename was
     reiserfs-truncate-blocks-not-used-by-a-write-v2-fix.patch

This patch was dropped because it was folded into reiserfs-truncate-blocks-not-used-by-a-write-v2.patch

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: reiserfs-truncate-blocks-not-used-by-a-write-v2-fix
From: Jan Kara <jack@xxxxxxx>

  Andrew, this patch should have been replaced by the one below - this
version causes data corruption when using writev() (same problem as ext3 &
ext4 had)... I've sent you a new version on 2009-12-02 but apparently you
didn't see it.

Signed-off-by: Jan Kara <jack@xxxxxxx>
Cc: Jeff Mahoney <jeffm@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 fs/reiserfs/inode.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff -puN fs/reiserfs/inode.c~reiserfs-truncate-blocks-not-used-by-a-write-v2-fix fs/reiserfs/inode.c
--- a/fs/reiserfs/inode.c~reiserfs-truncate-blocks-not-used-by-a-write-v2-fix
+++ a/fs/reiserfs/inode.c
@@ -2538,6 +2538,12 @@ static int reiserfs_writepage(struct pag
 	return reiserfs_write_full_page(page, wbc);
 }
 
+static void reiserfs_truncate_failed_write(struct inode *inode)
+{
+	truncate_inode_pages(inode->i_mapping, inode->i_size);
+	reiserfs_truncate_file(inode, 0);
+}
+
 static int reiserfs_write_begin(struct file *file,
 				struct address_space *mapping,
 				loff_t pos, unsigned len, unsigned flags,
@@ -2605,7 +2611,7 @@ static int reiserfs_write_begin(struct f
 		unlock_page(page);
 		page_cache_release(page);
 		/* Truncate allocated blocks */
-		reiserfs_truncate_file(inode, 0);
+		reiserfs_truncate_failed_write(inode);
 	}
 	return ret;
 }
@@ -2753,7 +2759,7 @@ static int reiserfs_write_end(struct fil
 	page_cache_release(page);
 
 	if (pos + len > inode->i_size)
-		reiserfs_truncate_file(inode, 0);
+		reiserfs_truncate_failed_write(inode);
 
 	return ret == 0 ? copied : ret;
 
_

Patches currently in -mm which might be from jack@xxxxxxx are

origin.patch
reiserfs-truncate-blocks-not-used-by-a-write-v2.patch
reiserfs-truncate-blocks-not-used-by-a-write-v2-fix.patch
linux-next.patch
reiser4-update-names-of-quota-methods.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux