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=-9.5 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT 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 1D81DC35670 for ; Sun, 23 Feb 2020 07:28:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EA1E9206E0 for ; Sun, 23 Feb 2020 07:28:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726302AbgBWH2Q (ORCPT ); Sun, 23 Feb 2020 02:28:16 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:1768 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725980AbgBWH2Q (ORCPT ); Sun, 23 Feb 2020 02:28:16 -0500 Received: from pps.filterd (m0098420.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 01N7P39U190981; Sun, 23 Feb 2020 02:28:13 -0500 Received: from pps.reinject (localhost [127.0.0.1]) by mx0b-001b2d01.pphosted.com with ESMTP id 2yb1c52dm5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 23 Feb 2020 02:28:13 -0500 Received: from m0098420.ppops.net (m0098420.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id 01N7S9VO196097; Sun, 23 Feb 2020 02:28:13 -0500 Received: from ppma01wdc.us.ibm.com (fd.55.37a9.ip4.static.sl-reverse.com [169.55.85.253]) by mx0b-001b2d01.pphosted.com with ESMTP id 2yb1c52dku-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 23 Feb 2020 02:28:13 -0500 Received: from pps.filterd (ppma01wdc.us.ibm.com [127.0.0.1]) by ppma01wdc.us.ibm.com (8.16.0.27/8.16.0.27) with SMTP id 01N7P4Mp025081; Sun, 23 Feb 2020 07:28:12 GMT Received: from b01cxnp23032.gho.pok.ibm.com (b01cxnp23032.gho.pok.ibm.com [9.57.198.27]) by ppma01wdc.us.ibm.com with ESMTP id 2yaux5sk6n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 23 Feb 2020 07:28:12 +0000 Received: from b01ledav004.gho.pok.ibm.com (b01ledav004.gho.pok.ibm.com [9.57.199.109]) by b01cxnp23032.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 01N7SC9S49742116 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 23 Feb 2020 07:28:12 GMT Received: from b01ledav004.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3574C112062; Sun, 23 Feb 2020 07:28:12 +0000 (GMT) Received: from b01ledav004.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D6191112061; Sun, 23 Feb 2020 07:28:09 +0000 (GMT) Received: from localhost.localdomain.com (unknown [9.102.2.13]) by b01ledav004.gho.pok.ibm.com (Postfix) with ESMTP; Sun, 23 Feb 2020 07:28:09 +0000 (GMT) From: Chandan Rajendra To: linux-xfs@vger.kernel.org Cc: Chandan Rajendra , david@fromorbit.com, chandan@linux.ibm.com, darrick.wong@oracle.com, bfoster@redhat.com Subject: [PATCH V4 4/7] xfs: Introduce struct xfs_attr_set_resv Date: Sun, 23 Feb 2020 13:00:41 +0530 Message-Id: <20200223073044.14215-4-chandanrlinux@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20200223073044.14215-1-chandanrlinux@gmail.com> References: <20200223073044.14215-1-chandanrlinux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138,18.0.572 definitions=2020-02-22_08:2020-02-21,2020-02-22 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 priorityscore=1501 impostorscore=0 suspectscore=1 adultscore=0 mlxlogscore=999 bulkscore=0 lowpriorityscore=0 malwarescore=0 mlxscore=0 spamscore=0 clxscore=1034 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2001150001 definitions=main-2002230063 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org The intermediate numbers calculated by xfs_attr_calc_size() will be needed by a future commit to correctly calculate log reservation for xattr set operation. Towards this goal, this commit introduces 'struct xfs_attr_set_resv' to collect, 1. Number of dabtree blocks. 2. Number of remote blocks. 3. Number of Bmbt blocks. 4. Total number of blocks we need to reserve. This will be returned as an out argument by xfs_attr_calc_size(). Signed-off-by: Chandan Rajendra --- fs/xfs/libxfs/xfs_attr.c | 50 ++++++++++++++++++++++------------------ fs/xfs/libxfs/xfs_attr.h | 13 +++++++++++ 2 files changed, 40 insertions(+), 23 deletions(-) diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c index a708b142f69b6..921acac71e5d9 100644 --- a/fs/xfs/libxfs/xfs_attr.c +++ b/fs/xfs/libxfs/xfs_attr.c @@ -136,16 +136,14 @@ xfs_attr_get( /* * Calculate how many blocks we need for the new attribute, */ -STATIC int +STATIC void xfs_attr_calc_size( - struct xfs_da_args *args, - int *local) + struct xfs_da_args *args, + struct xfs_attr_set_resv *resv, + int *local) { - struct xfs_mount *mp = args->dp->i_mount; - unsigned int total_dablks; - unsigned int bmbt_blks; - unsigned int rmt_blks; - int size; + struct xfs_mount *mp = args->dp->i_mount; + int size; /* * Determine space new attribute will use, and if it would be @@ -153,25 +151,27 @@ xfs_attr_calc_size( */ size = xfs_attr_leaf_newentsize(args->geo, args->namelen, args->valuelen, local); - total_dablks = XFS_DAENTER_BLOCKS(mp, XFS_ATTR_FORK); + resv->total_dablks = XFS_DAENTER_BLOCKS(mp, XFS_ATTR_FORK); if (*local) { if (size > (args->geo->blksize / 2)) { /* Double split possible */ - total_dablks *= 2; + resv->total_dablks *= 2; } - rmt_blks = 0; + resv->rmt_blks = 0; } else { /* * Out of line attribute, cannot double split, but * make room for the attribute value itself. */ - rmt_blks = xfs_attr3_rmt_blocks(mp, args->valuelen); + resv->rmt_blks = xfs_attr3_rmt_blocks(mp, args->valuelen); } - bmbt_blks = XFS_NEXTENTADD_SPACE_RES(mp, total_dablks + rmt_blks, - XFS_ATTR_FORK); + resv->bmbt_blks = XFS_NEXTENTADD_SPACE_RES(mp, + resv->total_dablks + resv->rmt_blks, + XFS_ATTR_FORK); - return total_dablks + rmt_blks + bmbt_blks; + resv->alloc_blks = resv->total_dablks + resv->rmt_blks + + resv->bmbt_blks; } STATIC int @@ -295,14 +295,17 @@ xfs_attr_remove_args( */ int xfs_attr_set( - struct xfs_da_args *args) + struct xfs_da_args *args) { - struct xfs_inode *dp = args->dp; - struct xfs_mount *mp = dp->i_mount; - struct xfs_trans_res tres; - bool rsvd = (args->attr_namespace & XFS_ATTR_ROOT); - int error, local; - unsigned int total; + struct xfs_inode *dp = args->dp; + struct xfs_mount *mp = dp->i_mount; + struct xfs_attr_set_resv resv; + struct xfs_trans_res tres; + bool rsvd; + int error, local; + unsigned int total; + + rsvd = (args->attr_namespace & XFS_ATTR_ROOT); if (XFS_FORCED_SHUTDOWN(dp->i_mount)) return -EIO; @@ -326,7 +329,8 @@ xfs_attr_set( XFS_STATS_INC(mp, xs_attr_set); args->op_flags |= XFS_DA_OP_ADDNAME; - args->total = xfs_attr_calc_size(args, &local); + xfs_attr_calc_size(args, &resv, &local); + args->total = resv.alloc_blks; /* * If the inode doesn't have an attribute fork, add one. diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h index 861c81f9bb918..dc08bdfbc9615 100644 --- a/fs/xfs/libxfs/xfs_attr.h +++ b/fs/xfs/libxfs/xfs_attr.h @@ -73,6 +73,19 @@ struct xfs_attr_list_context { int index; /* index into output buffer */ }; +struct xfs_attr_set_resv { + /* Number of unlogged blocks needed to store the remote attr value. */ + unsigned int rmt_blks; + + /* Number of filesystem blocks to allocate for the da btree. */ + unsigned int total_dablks; + + /* Blocks we might need to create all the new attr fork mappings. */ + unsigned int bmbt_blks; + + /* Total number of blocks we might have to allocate. */ + unsigned int alloc_blks; +}; /*======================================================================== * Function prototypes for the kernel. -- 2.19.1