From patchwork Wed Sep 24 08:57:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kara X-Patchwork-Id: 392826 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 63B1B140095 for ; Wed, 24 Sep 2014 19:03:01 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752192AbaIXJC6 (ORCPT ); Wed, 24 Sep 2014 05:02:58 -0400 Received: from cantor2.suse.de ([195.135.220.15]:58768 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753085AbaIXI51 (ORCPT ); Wed, 24 Sep 2014 04:57:27 -0400 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 1D8C0ACCD; Wed, 24 Sep 2014 08:57:26 +0000 (UTC) Received: by quack.suse.cz (Postfix, from userid 1000) id 241B381F97; Wed, 24 Sep 2014 10:57:24 +0200 (CEST) Date: Wed, 24 Sep 2014 10:57:24 +0200 From: Jan Kara To: linux-fsdevel@vger.kernel.org Cc: linux-mm@kvack.org, Dave Chinner , linux-ext4@vger.kernel.org, Ted Tso , Jan Kara , xfs@oss.sgi.com Subject: Re: [PATCH 2/2] ext4: Fix mmap data corruption when blocksize < pagesize Message-ID: <20140924085724.GA21864@quack.suse.cz> References: <1411484603-17756-1-git-send-email-jack@suse.cz> <1411484603-17756-3-git-send-email-jack@suse.cz> <20140924084519.GA21987@quack.suse.cz> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20140924084519.GA21987@quack.suse.cz> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org On Wed 24-09-14 10:45:19, Jan Kara wrote: > On Tue 23-09-14 17:03:23, Jan Kara wrote: > > Use block_create_hole() when hole is being created in a file so that > > ->page_mkwrite() will get called for the partial tail page if it is > > mmaped (see the first patch in the series for details). > Just out of curiosity I did a change similar to this one for ext4 to XFS > and indeed it fixed generic/030 test failures for XFS with blocksize 1k. Just for reference attached the patch I was testing - I can resend with proper changelog etc. if people are fine with this approach. Honza > > Signed-off-by: Jan Kara > > --- > > fs/ext4/inode.c | 6 +++++- > > 1 file changed, 5 insertions(+), 1 deletion(-) > > > > diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c > > index 3aa26e9117c4..fdcb007c2c9e 100644 > > --- a/fs/ext4/inode.c > > +++ b/fs/ext4/inode.c > > @@ -4536,8 +4536,12 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr) > > ext4_orphan_del(NULL, inode); > > goto err_out; > > } > > - } else > > + } else { > > + loff_t old_size = inode->i_size; > > + > > i_size_write(inode, attr->ia_size); > > + block_create_hole(inode, old_size, inode->i_size); > > + } > > > > /* > > * Blocks are going to be removed from the inode. Wait > > -- > > 1.8.1.4 > > > -- > Jan Kara > SUSE Labs, CR > -- > To unsubscribe from this list: send the line "unsubscribe linux-ext4" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html From ceedc36b1c99c25ebb55c88f6ab059347b52f4ec Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Wed, 24 Sep 2014 10:18:25 +0200 Subject: [PATCH] xfs: Fix mmap data corruption Signed-off-by: Jan Kara --- fs/xfs/xfs_iops.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c index 72129493e9d3..19ce64bfb4f7 100644 --- a/fs/xfs/xfs_iops.c +++ b/fs/xfs/xfs_iops.c @@ -848,6 +848,8 @@ xfs_setattr_size( if (error) return error; truncate_setsize(inode, newsize); + if (oldsize < newsize) + block_create_hole(inode, oldsize, newsize); tp = xfs_trans_alloc(mp, XFS_TRANS_SETATTR_SIZE); error = xfs_trans_reserve(tp, &M_RES(mp)->tr_itruncate, 0, 0); -- 1.8.1.4