From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4B9BCC433DF for ; Wed, 3 Jun 2020 00:32:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1D54020738 for ; Wed, 3 Jun 2020 00:32:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="GkGK+vFB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728263AbgFCAc6 (ORCPT ); Tue, 2 Jun 2020 20:32:58 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:38688 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726112AbgFCAc6 (ORCPT ); Tue, 2 Jun 2020 20:32:58 -0400 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 0530MY05191075; Wed, 3 Jun 2020 00:32:53 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : references : mime-version : content-type : in-reply-to; s=corp-2020-01-29; bh=i+JgU6wuH7XagI0H/6LeESCpv0Soy2J+uaACBWQ5Mqw=; b=GkGK+vFBm9aAQSB0Zg0v0l+gcX0Q+kHeE7nNK0c3eXKKi5T4/w6MMj0Fp/LiPxU/LNRp lz6jnbsHzWoKqXh5mE5vPi1bh6kDgiS8Ye5Q63/iEWGdXN9YIKcBEQGrQRJ6hvpPVApf 1WkAiIjWLqHesB9vSdoOjTrOc3RxLAzaci79nHwFICAI/mEhHbMa1AfXfRp++/a8b3cm z5B/gEXIOYiUSCiLKQhMZ3hVAsec6Nftlcs5XtYAx+gh/sAOWdZd1qjHJeEYGCyj+0Oj dLjRcdmyAeH5xXLc8zQjSarxaGUoSe36PnVJEk5qc6lK94FVFt6lNpziRt/GCS7KNHva dA== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by userp2130.oracle.com with ESMTP id 31bewqxnxy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 03 Jun 2020 00:32:53 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 0530HvqB013521; Wed, 3 Jun 2020 00:30:52 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserp3020.oracle.com with ESMTP id 31c25qeyc9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 03 Jun 2020 00:30:52 +0000 Received: from abhmp0002.oracle.com (abhmp0002.oracle.com [141.146.116.8]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id 0530Uk2F004997; Wed, 3 Jun 2020 00:30:46 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 02 Jun 2020 17:30:46 -0700 Date: Tue, 2 Jun 2020 17:30:45 -0700 From: "Darrick J. Wong" To: Christoph Hellwig Cc: linux-xfs@vger.kernel.org Subject: Re: [PATCH 06/14] xfs: move the di_cowextsize field to struct xfs_inode Message-ID: <20200603003045.GV8230@magnolia> References: <20200524091757.128995-1-hch@lst.de> <20200524091757.128995-7-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200524091757.128995-7-hch@lst.de> X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9640 signatures=668686 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 suspectscore=1 spamscore=0 malwarescore=0 bulkscore=0 mlxscore=0 phishscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2004280000 definitions=main-2006030000 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9640 signatures=668686 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 bulkscore=0 phishscore=0 suspectscore=1 impostorscore=0 cotscore=-2147483648 lowpriorityscore=0 mlxscore=0 adultscore=0 spamscore=0 mlxlogscore=999 malwarescore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2004280000 definitions=main-2006030000 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org On Sun, May 24, 2020 at 11:17:49AM +0200, Christoph Hellwig wrote: > In preparation of removing the historic icinode struct, move the > cowextsize field into the containing xfs_inode structure. > > Signed-off-by: Christoph Hellwig > --- > fs/xfs/libxfs/xfs_inode_buf.c | 4 ++-- > fs/xfs/libxfs/xfs_inode_buf.h | 1 - > fs/xfs/xfs_file.c | 2 +- > fs/xfs/xfs_inode.c | 6 +++--- > fs/xfs/xfs_inode.h | 1 + > fs/xfs/xfs_inode_item.c | 2 +- > fs/xfs/xfs_ioctl.c | 8 +++----- > fs/xfs/xfs_itable.c | 2 +- > fs/xfs/xfs_reflink.c | 2 +- > 9 files changed, 13 insertions(+), 15 deletions(-) > > diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c > index e51b15c44bb3e..860e35611e001 100644 > --- a/fs/xfs/libxfs/xfs_inode_buf.c > +++ b/fs/xfs/libxfs/xfs_inode_buf.c > @@ -255,7 +255,7 @@ xfs_inode_from_disk( > to->di_crtime.tv_sec = be32_to_cpu(from->di_crtime.t_sec); > to->di_crtime.tv_nsec = be32_to_cpu(from->di_crtime.t_nsec); > to->di_flags2 = be64_to_cpu(from->di_flags2); > - to->di_cowextsize = be32_to_cpu(from->di_cowextsize); > + ip->i_cowextsize = be32_to_cpu(from->di_cowextsize); > } > > error = xfs_iformat_data_fork(ip, from); > @@ -321,7 +321,7 @@ xfs_inode_to_disk( > to->di_crtime.t_sec = cpu_to_be32(from->di_crtime.tv_sec); > to->di_crtime.t_nsec = cpu_to_be32(from->di_crtime.tv_nsec); > to->di_flags2 = cpu_to_be64(from->di_flags2); > - to->di_cowextsize = cpu_to_be32(from->di_cowextsize); > + to->di_cowextsize = cpu_to_be32(ip->i_cowextsize); > to->di_ino = cpu_to_be64(ip->i_ino); > to->di_lsn = cpu_to_be64(lsn); > memset(to->di_pad2, 0, sizeof(to->di_pad2)); > diff --git a/fs/xfs/libxfs/xfs_inode_buf.h b/fs/xfs/libxfs/xfs_inode_buf.h > index d420ea835c839..663a97fa78f05 100644 > --- a/fs/xfs/libxfs/xfs_inode_buf.h > +++ b/fs/xfs/libxfs/xfs_inode_buf.h > @@ -23,7 +23,6 @@ struct xfs_icdinode { > uint16_t di_flags; /* random flags, XFS_DIFLAG_... */ > > uint64_t di_flags2; /* more random flags */ > - uint32_t di_cowextsize; /* basic cow extent size for file */ > > struct timespec64 di_crtime; /* time created */ > }; > diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c > index 14b533a8ce8e6..b0384306d6622 100644 > --- a/fs/xfs/xfs_file.c > +++ b/fs/xfs/xfs_file.c > @@ -1055,7 +1055,7 @@ xfs_file_remap_range( > (src->i_d.di_flags2 & XFS_DIFLAG2_COWEXTSIZE) && > pos_out == 0 && len >= i_size_read(inode_out) && > !(dest->i_d.di_flags2 & XFS_DIFLAG2_COWEXTSIZE)) > - cowextsize = src->i_d.di_cowextsize; > + cowextsize = src->i_cowextsize; > > ret = xfs_reflink_update_dest(dest, pos_out + len, cowextsize, > remap_flags); > diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c > index 777dadc3fd531..ef6a4c313ebbd 100644 > --- a/fs/xfs/xfs_inode.c > +++ b/fs/xfs/xfs_inode.c > @@ -82,7 +82,7 @@ xfs_get_cowextsz_hint( > > a = 0; > if (ip->i_d.di_flags2 & XFS_DIFLAG2_COWEXTSIZE) > - a = ip->i_d.di_cowextsize; > + a = ip->i_cowextsize; > b = xfs_get_extsz_hint(ip); > > a = max(a, b); > @@ -842,7 +842,7 @@ xfs_ialloc( > if (xfs_sb_version_has_v3inode(&mp->m_sb)) { > inode_set_iversion(inode, 1); > ip->i_d.di_flags2 = 0; > - ip->i_d.di_cowextsize = 0; > + ip->i_cowextsize = 0; > ip->i_d.di_crtime = tv; > } > > @@ -901,7 +901,7 @@ xfs_ialloc( > if (pip && (pip->i_d.di_flags2 & XFS_DIFLAG2_ANY)) { > if (pip->i_d.di_flags2 & XFS_DIFLAG2_COWEXTSIZE) { > ip->i_d.di_flags2 |= XFS_DIFLAG2_COWEXTSIZE; > - ip->i_d.di_cowextsize = pip->i_d.di_cowextsize; > + ip->i_cowextsize = pip->i_cowextsize; > } > if (pip->i_d.di_flags2 & XFS_DIFLAG2_DAX) > ip->i_d.di_flags2 |= XFS_DIFLAG2_DAX; > diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h > index af90c6f745549..f6aa97fde63cb 100644 > --- a/fs/xfs/xfs_inode.h > +++ b/fs/xfs/xfs_inode.h > @@ -58,6 +58,7 @@ typedef struct xfs_inode { > xfs_rfsblock_t i_nblocks; /* # of direct & btree blocks */ > uint32_t i_projid; /* owner's project id */ > xfs_extlen_t i_extsize; /* basic/minimum extent size */ > + uint32_t i_cowextsize; /* basic cow extent size */ You might as well fix this to xfs_extlen_t while you're doing this. --D > > struct xfs_icdinode i_d; /* most of ondisk inode */ > > diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c > index 8b8c99809f273..ab0d8cf8ceb6a 100644 > --- a/fs/xfs/xfs_inode_item.c > +++ b/fs/xfs/xfs_inode_item.c > @@ -343,7 +343,7 @@ xfs_inode_to_log_dinode( > to->di_crtime.t_sec = from->di_crtime.tv_sec; > to->di_crtime.t_nsec = from->di_crtime.tv_nsec; > to->di_flags2 = from->di_flags2; > - to->di_cowextsize = from->di_cowextsize; > + to->di_cowextsize = ip->i_cowextsize; > to->di_ino = ip->i_ino; > to->di_lsn = lsn; > memset(to->di_pad2, 0, sizeof(to->di_pad2)); > diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c > index aeb1de3aec60f..a9b31ae3c28c0 100644 > --- a/fs/xfs/xfs_ioctl.c > +++ b/fs/xfs/xfs_ioctl.c > @@ -1108,8 +1108,7 @@ xfs_fill_fsxattr( > > simple_fill_fsxattr(fa, xfs_ip2xflags(ip)); > fa->fsx_extsize = ip->i_extsize << ip->i_mount->m_sb.sb_blocklog; > - fa->fsx_cowextsize = ip->i_d.di_cowextsize << > - ip->i_mount->m_sb.sb_blocklog; > + fa->fsx_cowextsize = ip->i_cowextsize << ip->i_mount->m_sb.sb_blocklog; > fa->fsx_projid = ip->i_projid; > if (ifp && (ifp->if_flags & XFS_IFEXTENTS)) > fa->fsx_nextents = xfs_iext_count(ifp); > @@ -1574,10 +1573,9 @@ xfs_ioctl_setattr( > ip->i_extsize = 0; > if (xfs_sb_version_has_v3inode(&mp->m_sb) && > (ip->i_d.di_flags2 & XFS_DIFLAG2_COWEXTSIZE)) > - ip->i_d.di_cowextsize = fa->fsx_cowextsize >> > - mp->m_sb.sb_blocklog; > + ip->i_cowextsize = fa->fsx_cowextsize >> mp->m_sb.sb_blocklog; > else > - ip->i_d.di_cowextsize = 0; > + ip->i_cowextsize = 0; > > code = xfs_trans_commit(tp); > > diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c > index b0f0c19fd7822..7937af9f2ea77 100644 > --- a/fs/xfs/xfs_itable.c > +++ b/fs/xfs/xfs_itable.c > @@ -112,7 +112,7 @@ xfs_bulkstat_one_int( > > if (xfs_sb_version_has_v3inode(&mp->m_sb)) { > if (dic->di_flags2 & XFS_DIFLAG2_COWEXTSIZE) > - buf->bs_cowextsize_blks = dic->di_cowextsize; > + buf->bs_cowextsize_blks = ip->i_cowextsize; > } > > switch (ip->i_df.if_format) { > diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c > index 8598896156e29..0e07fa7e43117 100644 > --- a/fs/xfs/xfs_reflink.c > +++ b/fs/xfs/xfs_reflink.c > @@ -942,7 +942,7 @@ xfs_reflink_update_dest( > } > > if (cowextsize) { > - dest->i_d.di_cowextsize = cowextsize; > + dest->i_cowextsize = cowextsize; > dest->i_d.di_flags2 |= XFS_DIFLAG2_COWEXTSIZE; > } > > -- > 2.26.2 >