From patchwork Mon Nov 7 09:01:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allison Henderson X-Patchwork-Id: 13034122 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3E4B8C4321E for ; Mon, 7 Nov 2022 09:02:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231521AbiKGJCM (ORCPT ); Mon, 7 Nov 2022 04:02:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231518AbiKGJCI (ORCPT ); Mon, 7 Nov 2022 04:02:08 -0500 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3932C15FE0 for ; Mon, 7 Nov 2022 01:02:07 -0800 (PST) Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 2A78mQfk032427 for ; Mon, 7 Nov 2022 09:02:07 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=p+Mj2o48KZIU06tjOsGJKlU3MX9+qMBJYtvtML+DC1k=; b=JhqqgOdB9hHyvvwx6ZW1Ok1X3QDuyRn3Orsbj03tY8DrceRCw3K7a9jOaddp4bGO9ByZ 8+EU1UOpwKTG0QMXuXjdTXZzmrc2kGAHgsCS+FgRNVfQbVdcCA+++vziQSyUdzK2vL5n CvmpYsj2g3l1xDWINOx056gyvNZbJGR4DYOKnqfNfUw6CN0h0CdFEsWJWOSfD1BTJ74y 9a1GkxmbMYwOwVEusi/Xl4W3Nfcjx1Hfv6rk54uyauJDDZTiKXyYkHC++fnbFnkkrte3 7fSaQhsaKkXFSzZH1OuBDw92zboWkQiNrdApw4LIz14koj4EyysxOxpFnH2vQo1a2vXp Yw== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3kngk6b7k4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:02:06 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2A77guUf023854 for ; Mon, 7 Nov 2022 09:02:05 GMT Received: from nam04-bn8-obe.outbound.protection.outlook.com (mail-bn8nam04lp2047.outbound.protection.outlook.com [104.47.74.47]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3kpcsc2xrs-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:02:05 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=euLw97mJJCH/v6fsROKr/kHxxMo+pVWScrmLuBC9mdbpOkyj9U13hycLWb3dYQm60yOw15jqIrqvbY7JEOvbJLCy0GX8is40VGUucFKQZsM+XdiS5wMY2iJDyW+qKYMVJMJvCJXjxHMCg0/Ea/rbwKBB2NkPPW6EaThD+NkPW1QPPYU6iSVy2t1NU0gzDNmcRnk4p7gO741s3H/9OvDsomHjXIgVIbRJI6mtQ0BZt1Xf4kA/C1fmNn2eFMtz2x+JTPMImCrj5J6ENVEyareHfWzh63Eu8eKLZrUvKH6BZ7ZGygwisGs7kW2n7dptWkT6WJued0S6zYTLU0RsuycWrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=p+Mj2o48KZIU06tjOsGJKlU3MX9+qMBJYtvtML+DC1k=; b=QVmUTmG6lXTGbEtVCIqdR5f3Kj5UrmGsCTzYoz1efNT/H8HoyraVAoiTIObdl8D5Dc0ieb62dtR1uPyUZ7fFgNjRU6mNcs09niuSHBznRTCQFsbd/4kWSf23WHyLEA0VaSdhK6v9pBFmnz895O1kb1NOCqIdMmDmEpE89Z/5re+cFuDW78A9qYbUN6TU26ZiyzKZcj30j3XCp06whe96otqOwmNpW/SeQ6OzJvRPJkkQaMZoeutH3MpfU1VTJIlQBAvs7nWWWJthY2cKqdX9IWTxR1t1vzyVjCvrPt4pqJHFlHDYvqgn5XFRhZ1sN2taVZBD4N+Lia95Tk6wlbt/zA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=p+Mj2o48KZIU06tjOsGJKlU3MX9+qMBJYtvtML+DC1k=; b=HZb8zF9j8MSOvPzAxaFynpsBkESPBTjCilVbXW5cwv8mb/o0owCDiBlMqkwoLyPaiMjx9aVRpwP/ikU4ws9SQa82nuPCSlIVvO4Vt+ZWAoITWIl00axUwE8qn3cTBfZUgDDH/C0e4bha9QKFC7SrVvpq/U+OOG9VDSexC/Oosh0= Received: from BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) by PH8PR10MB6387.namprd10.prod.outlook.com (2603:10b6:510:1c2::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.26; Mon, 7 Nov 2022 09:01:59 +0000 Received: from BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3]) by BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3%4]) with mapi id 15.20.5791.026; Mon, 7 Nov 2022 09:01:59 +0000 From: allison.henderson@oracle.com To: linux-xfs@vger.kernel.org Subject: [PATCH v5 01/26] xfs: Add new name to attri/d Date: Mon, 7 Nov 2022 02:01:31 -0700 Message-Id: <20221107090156.299319-2-allison.henderson@oracle.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221107090156.299319-1-allison.henderson@oracle.com> References: <20221107090156.299319-1-allison.henderson@oracle.com> X-ClientProxiedBy: BYAPR05CA0049.namprd05.prod.outlook.com (2603:10b6:a03:74::26) To BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB4306:EE_|PH8PR10MB6387:EE_ X-MS-Office365-Filtering-Correlation-Id: c1631fe5-990b-4718-3634-08dac09ebac2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 118KUwRIJ40EVQSF8pAMmnrCCHnTb/Zrc1zFD/bFls77GImWrvkAPtY+IVld4+TpE8dEhwaq/Qf18fu2D+C5CHCDlbRIsmlQQlA/6U88rl+BgfgiFMak2jW7elK6jjHW3x3oK0qT3nlDl3shjpqO5jguKUPjvmoCcNzYVN+9RZ+YdHpahjjbVstqLkXNK1bjMdFqA2OlIeSt2rc5Xh7V8PRFAUJmTW2sVPBE2Tqu3l6wlFuGqZxC4xKXk5YYUME3WslBkOA5kpfkHtmW+EvOrexT6Ojgh+JJoIxBN85QMd4Ruem3Vr3TmJb7dxpD2FtgUu4YODVAYAjbSSbpcojPiF5YKLR8sUQ7TRkmkduoAoGjxWQNp71iBnCaBe0he9v2fv7774c3//FV36JvJuueIjeAaE8XBFa4HzECpxRiITs9PoHBg70qbwP6AkaZ3ERdUrMhIpQY6pJVwhQJlQx6PXwZYEjdMqFn33BSeWoarXK544iw8lSv4WXqDJalY+oqbhC0pXBlRnXa9BXLNb8XhDa/40csQBWMquYlrd0sbAcWXTCxfwbBGkVjZnlZZAnvOPfEAybY4MRehsH+Oe0KlT1s59aq5WBEE4Ec2YbYVAuf4MsdnRFX0W4YFdBTRv+Zo8h9MrQ/2qTsqhdB/4ORowmazuXjeanM0KBS8tVmXjtlEAh8ac7wX33Mzns3Ywk73JtT0zL45RWesOAsqeTdSQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB4306.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(346002)(39860400002)(366004)(136003)(376002)(396003)(451199015)(36756003)(86362001)(30864003)(2906002)(6512007)(9686003)(26005)(6666004)(6506007)(2616005)(186003)(1076003)(83380400001)(66946007)(66556008)(66476007)(6916009)(316002)(478600001)(8676002)(8936002)(6486002)(5660300002)(41300700001)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: c0shIl4BLb4q6vzTtLdqBFhPbW16uWLsgvnWLz9QdpDCqy0ifZOP/qi4svMCgbBqsAdpxfcsxXY6KvTWe3k72r8XPO+7PrJa2IsPksjX0g4ghWbH7HD39cfTA7LQsJNotSsWw9g0w54J1NWsqKr2wQEW3+DReDzyeQm2AVhCzg1MQANMq+xjY/2Og/8eLCskf7ckVGmuUBU08AzZQXQh6sklVidUA6d2dlwogyILJu+ON0TdY9UBEXvx+MZkeiPpYtir+BESn5FEenzBWcNRhpYfrHsqSOLWFKZxrwRQ+4Jn6ecoqSYVd8966zSSJ/dit9P/E4N2OdOK9nOE+oKQI8ca11qZIdbNGg/tFntt7XPeuZYBmEzIOsPByrnyJgIvP36kcQz0a47xTrnHMqHqW+t0Qn15/fnjtn029CgM+6xojFXMG+e1NrGoh+bD9i9ETsjIUCNDpmQZ8tBzQ2DU31ZOAsO9pjKpmpr2+zg7aDZ/orotyv6/+FVXrg+z7MO8pBSdHw7d+Vfnjud/tb1zKv58hWoAUIuCEBAJLQ0JHR1QK2p5N6+Buq4ccpOOre4R4EG/S6WdfDbxKYYCx7wgQC+97uoUMnTfPl8vmfWhe/+pw8VYZTBE+GCFZAGFnV/CTuh4in25F1Ne1XwYoOfMuUnUt4PVu4/cEMzvLbajqT/0RPqKFyiXNDLhS/6iiQAa+hCDDwbl/o5pbbflSsUxKQ/iN0y/lZBmvcVihBmCVvEE6Qrv/YkrIZ9y76USkZq+FnrjeY1JklcfS1d0LzIa4DUBFgO1j5A0uxWFmjSTBl3nxfyvRcmUChRCEFXx7FNIWU/tjIQA/U/spUevm9jEosHHdA/Knp9n5oysccd7fp5+t+ahBO59OVkCdnSUh9nTq5RaYHBZZa0G77jk0Kv+YGgdS0PQYGh1wx972O6jKYfekmt0HQUMOKD+KZXFUFngwKD6xvU34sAN/1Am+4UsXt3juctNYA1ZHuMQtezojIL82c4m6J432jVSzF0lYxLjW9U9zljMFeET5EDLMDOx2BA3YLKrNKmkJlsilQm5Oo5nHguAgS6p3J6gsD6IQFbDJzBhHKC2Os71ZnosOPHFHSkdREfa0ChpMbsIvP22QtN3kr2JNLOWmw+R/6W4DHci42rxIbMWGcMpGjXF7gMmRtF5GcqNvwcPri7cU9QRuT0Hbqm5AxTRNTDhtdNpkndXewKReTxkFtsUvXkw2sZecmkR0Mhq5BWXrMBgbbUZg6e+dKusmQ/FfQ3NxJKuc7AU5HvwP8wHMk43edRsoXPbCQSvjHx6rTU+D/7EizjlkZgH+Qle62iYWykZ8j4I/7yqyl9m3h5GnOZm5t9Za5yiuxCC8b489aYA4qRsfH/u1QAojvt7mBUPSw4+p7SglcaeW1ug5jof4Pc6xQSsaKogqh8Vg5ta0qoM08cPsTMkc8m8B4V+bx9/ZH5EDE0ZfQ8dWinv6H88oBQnQ8SDmMtthrv9UqlZ58Qa/OqQN89eQqKFajL4wYAoJBFxJ4PJv1zA8M9WJ3ULN/RU9yW9+TwYiGPTeFlQ3OGcIWgP9BkorXmER49+wseMCtcq7EDGFRqRaPkcqcMF/F+X4xHpKhRNog== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: c1631fe5-990b-4718-3634-08dac09ebac2 X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4306.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2022 09:01:59.7940 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: lHkZ1ksGp3jsCfZUrPI7lDhrXIw1ahdo7wVixI0cRhv+AB3GmixqChhL4usM1qY6G0nY6PcWZZ8ZvSrp9lUDEzLHGeZrkJrqkn1+MwNYqZI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR10MB6387 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-07_02,2022-11-03_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxscore=0 spamscore=0 adultscore=0 malwarescore=0 mlxlogscore=999 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2211070076 X-Proofpoint-ORIG-GUID: iD5jZIcqCCTfYFGyEJ-7ufbwcX_5vYqY X-Proofpoint-GUID: iD5jZIcqCCTfYFGyEJ-7ufbwcX_5vYqY Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Allison Henderson This patch adds two new fields to the atti/d. They are nname and nnamelen. This will be used for parent pointer updates since a rename operation may cause the parent pointer to update both the name and value. So we need to carry both the new name as well as the target name in the attri/d. Signed-off-by: Allison Henderson --- fs/xfs/libxfs/xfs_attr.c | 12 ++- fs/xfs/libxfs/xfs_attr.h | 4 +- fs/xfs/libxfs/xfs_da_btree.h | 2 + fs/xfs/libxfs/xfs_log_format.h | 6 +- fs/xfs/xfs_attr_item.c | 135 +++++++++++++++++++++++++++------ fs/xfs/xfs_attr_item.h | 1 + 6 files changed, 133 insertions(+), 27 deletions(-) diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c index e28d93d232de..b1dbed7655e8 100644 --- a/fs/xfs/libxfs/xfs_attr.c +++ b/fs/xfs/libxfs/xfs_attr.c @@ -423,6 +423,12 @@ xfs_attr_complete_op( args->op_flags &= ~XFS_DA_OP_REPLACE; if (do_replace) { args->attr_filter &= ~XFS_ATTR_INCOMPLETE; + if (args->new_namelen > 0) { + args->name = args->new_name; + args->namelen = args->new_namelen; + args->hashval = xfs_da_hashname(args->name, + args->namelen); + } return replace_state; } return XFS_DAS_DONE; @@ -922,9 +928,13 @@ xfs_attr_defer_replace( struct xfs_da_args *args) { struct xfs_attr_intent *new; + int op_flag; int error = 0; - error = xfs_attr_intent_init(args, XFS_ATTRI_OP_FLAGS_REPLACE, &new); + op_flag = args->new_namelen == 0 ? XFS_ATTRI_OP_FLAGS_REPLACE : + XFS_ATTRI_OP_FLAGS_NVREPLACE; + + error = xfs_attr_intent_init(args, op_flag, &new); if (error) return error; diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h index 81be9b3e4004..3e81f3f48560 100644 --- a/fs/xfs/libxfs/xfs_attr.h +++ b/fs/xfs/libxfs/xfs_attr.h @@ -510,8 +510,8 @@ struct xfs_attr_intent { struct xfs_da_args *xattri_da_args; /* - * Shared buffer containing the attr name and value so that the logging - * code can share large memory buffers between log items. + * Shared buffer containing the attr name, new name, and value so that + * the logging code can share large memory buffers between log items. */ struct xfs_attri_log_nameval *xattri_nameval; diff --git a/fs/xfs/libxfs/xfs_da_btree.h b/fs/xfs/libxfs/xfs_da_btree.h index ffa3df5b2893..a4b29827603f 100644 --- a/fs/xfs/libxfs/xfs_da_btree.h +++ b/fs/xfs/libxfs/xfs_da_btree.h @@ -55,7 +55,9 @@ enum xfs_dacmp { typedef struct xfs_da_args { struct xfs_da_geometry *geo; /* da block geometry */ const uint8_t *name; /* string (maybe not NULL terminated) */ + const uint8_t *new_name; /* new attr name */ int namelen; /* length of string (maybe no NULL) */ + int new_namelen; /* new attr name len */ uint8_t filetype; /* filetype of inode for directories */ void *value; /* set of bytes (maybe contain NULLs) */ int valuelen; /* length of value */ diff --git a/fs/xfs/libxfs/xfs_log_format.h b/fs/xfs/libxfs/xfs_log_format.h index f13e0809dc63..ae9c99762a24 100644 --- a/fs/xfs/libxfs/xfs_log_format.h +++ b/fs/xfs/libxfs/xfs_log_format.h @@ -117,7 +117,8 @@ struct xfs_unmount_log_format { #define XLOG_REG_TYPE_ATTRD_FORMAT 28 #define XLOG_REG_TYPE_ATTR_NAME 29 #define XLOG_REG_TYPE_ATTR_VALUE 30 -#define XLOG_REG_TYPE_MAX 30 +#define XLOG_REG_TYPE_ATTR_NNAME 31 +#define XLOG_REG_TYPE_MAX 31 /* @@ -957,6 +958,7 @@ struct xfs_icreate_log { #define XFS_ATTRI_OP_FLAGS_SET 1 /* Set the attribute */ #define XFS_ATTRI_OP_FLAGS_REMOVE 2 /* Remove the attribute */ #define XFS_ATTRI_OP_FLAGS_REPLACE 3 /* Replace the attribute */ +#define XFS_ATTRI_OP_FLAGS_NVREPLACE 4 /* Replace attr name and val */ #define XFS_ATTRI_OP_FLAGS_TYPE_MASK 0xFF /* Flags type mask */ /* @@ -974,7 +976,7 @@ struct xfs_icreate_log { struct xfs_attri_log_format { uint16_t alfi_type; /* attri log item type */ uint16_t alfi_size; /* size of this item */ - uint32_t __pad; /* pad to 64 bit aligned */ + uint32_t alfi_nname_len; /* attr new name length */ uint64_t alfi_id; /* attri identifier */ uint64_t alfi_ino; /* the inode for this attr operation */ uint32_t alfi_op_flags; /* marks the op as a set or remove */ diff --git a/fs/xfs/xfs_attr_item.c b/fs/xfs/xfs_attr_item.c index 2788a6f2edcd..95e9ecbb4a67 100644 --- a/fs/xfs/xfs_attr_item.c +++ b/fs/xfs/xfs_attr_item.c @@ -75,6 +75,8 @@ static inline struct xfs_attri_log_nameval * xfs_attri_log_nameval_alloc( const void *name, unsigned int name_len, + const void *nname, + unsigned int nname_len, const void *value, unsigned int value_len) { @@ -85,15 +87,25 @@ xfs_attri_log_nameval_alloc( * this. But kvmalloc() utterly sucks, so we use our own version. */ nv = xlog_kvmalloc(sizeof(struct xfs_attri_log_nameval) + - name_len + value_len); + name_len + nname_len + value_len); nv->name.i_addr = nv + 1; nv->name.i_len = name_len; nv->name.i_type = XLOG_REG_TYPE_ATTR_NAME; memcpy(nv->name.i_addr, name, name_len); + if (nname_len) { + nv->nname.i_addr = nv->name.i_addr + name_len; + nv->nname.i_len = nname_len; + memcpy(nv->nname.i_addr, nname, nname_len); + } else { + nv->nname.i_addr = NULL; + nv->nname.i_len = 0; + } + nv->nname.i_type = XLOG_REG_TYPE_ATTR_NNAME; + if (value_len) { - nv->value.i_addr = nv->name.i_addr + name_len; + nv->value.i_addr = nv->name.i_addr + nname_len + name_len; nv->value.i_len = value_len; memcpy(nv->value.i_addr, value, value_len); } else { @@ -147,11 +159,15 @@ xfs_attri_item_size( *nbytes += sizeof(struct xfs_attri_log_format) + xlog_calc_iovec_len(nv->name.i_len); - if (!nv->value.i_len) - return; + if (nv->nname.i_len) { + *nvecs += 1; + *nbytes += xlog_calc_iovec_len(nv->nname.i_len); + } - *nvecs += 1; - *nbytes += xlog_calc_iovec_len(nv->value.i_len); + if (nv->value.i_len) { + *nvecs += 1; + *nbytes += xlog_calc_iovec_len(nv->value.i_len); + } } /* @@ -181,6 +197,9 @@ xfs_attri_item_format( ASSERT(nv->name.i_len > 0); attrip->attri_format.alfi_size++; + if (nv->nname.i_len > 0) + attrip->attri_format.alfi_size++; + if (nv->value.i_len > 0) attrip->attri_format.alfi_size++; @@ -188,6 +207,10 @@ xfs_attri_item_format( &attrip->attri_format, sizeof(struct xfs_attri_log_format)); xlog_copy_from_iovec(lv, &vecp, &nv->name); + + if (nv->nname.i_len > 0) + xlog_copy_from_iovec(lv, &vecp, &nv->nname); + if (nv->value.i_len > 0) xlog_copy_from_iovec(lv, &vecp, &nv->value); } @@ -374,6 +397,7 @@ xfs_attr_log_item( attrp->alfi_op_flags = attr->xattri_op_flags; attrp->alfi_value_len = attr->xattri_nameval->value.i_len; attrp->alfi_name_len = attr->xattri_nameval->name.i_len; + attrp->alfi_nname_len = attr->xattri_nameval->nname.i_len; ASSERT(!(attr->xattri_da_args->attr_filter & ~XFS_ATTRI_FILTER_MASK)); attrp->alfi_attr_filter = attr->xattri_da_args->attr_filter; } @@ -415,7 +439,8 @@ xfs_attr_create_intent( * deferred work state structure. */ attr->xattri_nameval = xfs_attri_log_nameval_alloc(args->name, - args->namelen, args->value, args->valuelen); + args->namelen, args->new_name, + args->new_namelen, args->value, args->valuelen); } attrip = xfs_attri_init(mp, attr->xattri_nameval); @@ -503,7 +528,8 @@ xfs_attri_validate( unsigned int op = attrp->alfi_op_flags & XFS_ATTRI_OP_FLAGS_TYPE_MASK; - if (attrp->__pad != 0) + if (attrp->alfi_op_flags != XFS_ATTRI_OP_FLAGS_NVREPLACE && + attrp->alfi_nname_len != 0) return false; if (attrp->alfi_op_flags & ~XFS_ATTRI_OP_FLAGS_TYPE_MASK) @@ -517,6 +543,7 @@ xfs_attri_validate( case XFS_ATTRI_OP_FLAGS_SET: case XFS_ATTRI_OP_FLAGS_REPLACE: case XFS_ATTRI_OP_FLAGS_REMOVE: + case XFS_ATTRI_OP_FLAGS_NVREPLACE: break; default: return false; @@ -526,9 +553,14 @@ xfs_attri_validate( return false; if ((attrp->alfi_name_len > XATTR_NAME_MAX) || + (attrp->alfi_nname_len > XATTR_NAME_MAX) || (attrp->alfi_name_len == 0)) return false; + if (op == XFS_ATTRI_OP_FLAGS_REMOVE && + attrp->alfi_value_len != 0) + return false; + return xfs_verify_ino(mp, attrp->alfi_ino); } @@ -589,6 +621,8 @@ xfs_attri_item_recover( args->whichfork = XFS_ATTR_FORK; args->name = nv->name.i_addr; args->namelen = nv->name.i_len; + args->new_name = nv->nname.i_addr; + args->new_namelen = nv->nname.i_len; args->hashval = xfs_da_hashname(args->name, args->namelen); args->attr_filter = attrp->alfi_attr_filter & XFS_ATTRI_FILTER_MASK; args->op_flags = XFS_DA_OP_RECOVERY | XFS_DA_OP_OKNOENT | @@ -599,6 +633,7 @@ xfs_attri_item_recover( switch (attr->xattri_op_flags) { case XFS_ATTRI_OP_FLAGS_SET: case XFS_ATTRI_OP_FLAGS_REPLACE: + case XFS_ATTRI_OP_FLAGS_NVREPLACE: args->value = nv->value.i_addr; args->valuelen = nv->value.i_len; args->total = xfs_attr_calc_size(args, &local); @@ -688,6 +723,7 @@ xfs_attri_item_relog( new_attrp->alfi_op_flags = old_attrp->alfi_op_flags; new_attrp->alfi_value_len = old_attrp->alfi_value_len; new_attrp->alfi_name_len = old_attrp->alfi_name_len; + new_attrp->alfi_nname_len = old_attrp->alfi_nname_len; new_attrp->alfi_attr_filter = old_attrp->alfi_attr_filter; xfs_trans_add_item(tp, &new_attrip->attri_item); @@ -710,48 +746,102 @@ xlog_recover_attri_commit_pass2( const void *attr_value = NULL; const void *attr_name; size_t len; - - attri_formatp = item->ri_buf[0].i_addr; - attr_name = item->ri_buf[1].i_addr; + const void *attr_nname = NULL; + int op, i = 0; /* Validate xfs_attri_log_format before the large memory allocation */ len = sizeof(struct xfs_attri_log_format); - if (item->ri_buf[0].i_len != len) { + if (item->ri_buf[i].i_len != len) { XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp, - item->ri_buf[0].i_addr, item->ri_buf[0].i_len); + item->ri_buf[i].i_addr, item->ri_buf[i].i_len); return -EFSCORRUPTED; } + attri_formatp = item->ri_buf[i].i_addr; if (!xfs_attri_validate(mp, attri_formatp)) { XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp, - item->ri_buf[0].i_addr, item->ri_buf[0].i_len); + item->ri_buf[i].i_addr, item->ri_buf[i].i_len); + return -EFSCORRUPTED; + } + + op = attri_formatp->alfi_op_flags & XFS_ATTRI_OP_FLAGS_TYPE_MASK; + switch (op) { + case XFS_ATTRI_OP_FLAGS_SET: + case XFS_ATTRI_OP_FLAGS_REPLACE: + if (item->ri_total != 3) { + XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp, + attri_formatp, len); + return -EFSCORRUPTED; + } + break; + case XFS_ATTRI_OP_FLAGS_REMOVE: + if (item->ri_total != 2) { + XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp, + attri_formatp, len); + return -EFSCORRUPTED; + } + break; + case XFS_ATTRI_OP_FLAGS_NVREPLACE: + if (item->ri_total != 4) { + XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp, + attri_formatp, len); + return -EFSCORRUPTED; + } + break; + default: + XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp, + attri_formatp, len); return -EFSCORRUPTED; } + i++; /* Validate the attr name */ - if (item->ri_buf[1].i_len != + if (item->ri_buf[i].i_len != xlog_calc_iovec_len(attri_formatp->alfi_name_len)) { XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp, - item->ri_buf[0].i_addr, item->ri_buf[0].i_len); + attri_formatp, len); return -EFSCORRUPTED; } + attr_name = item->ri_buf[i].i_addr; if (!xfs_attr_namecheck(attr_name, attri_formatp->alfi_name_len)) { XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp, - item->ri_buf[1].i_addr, item->ri_buf[1].i_len); + item->ri_buf[i].i_addr, item->ri_buf[i].i_len); return -EFSCORRUPTED; } + i++; + if (attri_formatp->alfi_nname_len) { + /* Validate the attr nname */ + if (item->ri_buf[i].i_len != + xlog_calc_iovec_len(attri_formatp->alfi_nname_len)) { + XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp, + item->ri_buf[i].i_addr, + item->ri_buf[i].i_len); + return -EFSCORRUPTED; + } + + attr_nname = item->ri_buf[i].i_addr; + if (!xfs_attr_namecheck(attr_nname, + attri_formatp->alfi_nname_len)) { + XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp, + item->ri_buf[i].i_addr, + item->ri_buf[i].i_len); + return -EFSCORRUPTED; + } + i++; + } + + /* Validate the attr value, if present */ if (attri_formatp->alfi_value_len != 0) { - if (item->ri_buf[2].i_len != xlog_calc_iovec_len(attri_formatp->alfi_value_len)) { + if (item->ri_buf[i].i_len != xlog_calc_iovec_len(attri_formatp->alfi_value_len)) { XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp, - item->ri_buf[0].i_addr, - item->ri_buf[0].i_len); + attri_formatp, len); return -EFSCORRUPTED; } - attr_value = item->ri_buf[2].i_addr; + attr_value = item->ri_buf[i].i_addr; } /* @@ -760,7 +850,8 @@ xlog_recover_attri_commit_pass2( * reference. */ nv = xfs_attri_log_nameval_alloc(attr_name, - attri_formatp->alfi_name_len, attr_value, + attri_formatp->alfi_name_len, attr_nname, + attri_formatp->alfi_nname_len, attr_value, attri_formatp->alfi_value_len); attrip = xfs_attri_init(mp, nv); diff --git a/fs/xfs/xfs_attr_item.h b/fs/xfs/xfs_attr_item.h index 3280a7930287..24d4968dd6cc 100644 --- a/fs/xfs/xfs_attr_item.h +++ b/fs/xfs/xfs_attr_item.h @@ -13,6 +13,7 @@ struct kmem_zone; struct xfs_attri_log_nameval { struct xfs_log_iovec name; + struct xfs_log_iovec nname; struct xfs_log_iovec value; refcount_t refcount; From patchwork Mon Nov 7 09:01:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allison Henderson X-Patchwork-Id: 13034120 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB16BC4332F for ; Mon, 7 Nov 2022 09:02:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231549AbiKGJCJ (ORCPT ); Mon, 7 Nov 2022 04:02:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231304AbiKGJCG (ORCPT ); Mon, 7 Nov 2022 04:02:06 -0500 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 72CF712AFA for ; Mon, 7 Nov 2022 01:02:04 -0800 (PST) Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 2A78mQfd032427 for ; Mon, 7 Nov 2022 09:02:03 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=MJB1AW2UOPFcnTki9xTmVDwD38jS9Ra5OdgjhRQ7TsY=; b=WOMFfedeo+dOZJ30ggf7Zb+hhQ9taBva9Ni0+oqm6f4aKQPJrTG73nERDyP4TI4DHtAq BQB4zhJ+yGM8NoQS6CRD+q5Ax5HcqW085syx+eSGXDs2/Ihldx/kXc7LLxXfDj/xlk9O lx82+pLMRFo5HtUTQTNVkXe9aLSqYNA5JFvgsw9u0LW5axdHf4K9/NPrBy6UQGv/9Y0+ aVmAiAQ7Zlzmnuoxe+azXlxN/iXpF77VMEiver5DKBY8kg5VSciBXPiYu38sy6KYrEgK mUAYmKWQ3wNDV/DiHYv2yjt4gmSketEgcrNt58sa62xxSMyi9sNO0nTyH7ZQaKoXKXH6 ug== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3kngk6b7jm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:02:03 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2A77gipo001698 for ; Mon, 7 Nov 2022 09:02:02 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1anam02lp2048.outbound.protection.outlook.com [104.47.57.48]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3kpcq0jk0p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:02:02 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bg8tFSpv7pEb7Ogz5bIeHMT9NYwAGM2z3ZQCGojVzb5VVHpbvQ5MVcNxJjf0ybCo1KpwqYzxbX9CNfDKftNAYW0eyxzOJ07ettyIhT84OSZYpgBlKcF/djaILykVnqB5pDHV3XpBun6GoD1Ws3psfo5G3RR9qX7BQSuIRD6+/BSLIyGbe6i1Qo6mJHvGwtyYcyWfCGHd9wN9YuIiZ09OabP0yGjv7w/cap+8M0AoeDyL9tsxpeBtYWrcnhYpGFqwQXQ5p74n0pFDCTGhQ+wFYjkvo/FWNvoVlEw4We4YAvt5y7d9kiE6JHoHpsxSiwKkGH9ivapHnrXD/OgGU3diVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=MJB1AW2UOPFcnTki9xTmVDwD38jS9Ra5OdgjhRQ7TsY=; b=G7/NfXah/PzQHXGazW/79yw6Y/GpMOHSPci1Nz/scybM/CFOrrsFXaqdJivNehkXG7Uor/i+gJHdsDDBbNuRbjPR22TXsV8KdEgOSVhTSrmJmTwxSGeN5ANj03EbfKiy1Nd1V6D/AnMK7fx0+7elxU2ec7YzZJWCfGa4xnNf7NExy7fKTsXO60BnJntB7xyWYe0TlFjr8GS/hQCGQTv7yj8Npg9CCHYfVrYko82q6QrAclwQaqXG2O40t2Pg0iZJJCT5RTOtlC4O8DeyOep4DYjDI8CV8p+NfT0BPMU2IpetFZRUpQuP8bE6NvlwIw9/0OXNS0qT/0oDI5hP1tDuhA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MJB1AW2UOPFcnTki9xTmVDwD38jS9Ra5OdgjhRQ7TsY=; b=bt4seHHvYDx5zOTP/xxN1g/MIknxAx15mdT0LePsMA9Lk+BU7j6VHbBWpREgiVmHalZfUHbNREJbx1uiB77GAhHfvjw1wyC5EGNfkVX1jpqBhS3GXxqKTsCwWX7sO1LQ7HdAlMwRaVeofr3eh2E8g4gW5DSs4A6HbbwBn+vJl6c= Received: from BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) by PH0PR10MB5848.namprd10.prod.outlook.com (2603:10b6:510:149::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Mon, 7 Nov 2022 09:02:01 +0000 Received: from BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3]) by BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3%4]) with mapi id 15.20.5791.026; Mon, 7 Nov 2022 09:02:00 +0000 From: allison.henderson@oracle.com To: linux-xfs@vger.kernel.org Subject: [PATCH v5 02/26] xfs: Increase XFS_DEFER_OPS_NR_INODES to 5 Date: Mon, 7 Nov 2022 02:01:32 -0700 Message-Id: <20221107090156.299319-3-allison.henderson@oracle.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221107090156.299319-1-allison.henderson@oracle.com> References: <20221107090156.299319-1-allison.henderson@oracle.com> X-ClientProxiedBy: BYAPR02CA0045.namprd02.prod.outlook.com (2603:10b6:a03:54::22) To BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB4306:EE_|PH0PR10MB5848:EE_ X-MS-Office365-Filtering-Correlation-Id: 19cf3c95-8091-4382-a052-08dac09ebb53 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uvn88IOGIeEp9cWulvotbZGPdg88UTIGIrCeEpfwYPAbw/1IYBbPWElnGqqrz/1/N2KqEn5Fe6gjABif9f7dwfKdSY+N5S3b+jI18H8kcbGQTLg5jWxAD/uPum5XiO5z9XWZWV9eEHnzwCQLC1timFxCDwie/dhssDmXjklrNfOz4Txu3FzIC2M28a+MOPTKiNkPsAYW7WBkJ8TC60Q4R166dYrAWfcpYYb2BFiPx5MjaQGNckZr4uTBANsAS4jhP6nSjaqLLgUqG9PMY4OGDd1BGOlcbzpI9JjJ5rzpPzb3lZvsjx39ajT3EMyNyLnwr9tzOAOYDmxLvjHWSJA1B0E9VIJdrseesPyII4HQcF59jtkJP/wyWKvXcmYToKyGgiSD5Z4uPqd6d6jXGqCmyRQtA0Cg0/yjMHX9n0K9pDUqmnA+TfEpfL03ZfmMKrz34t540XDgkn/Bb+hBbmrQdhktt4oecQjqI4oXOsiLjMqUunlPIh4SS9gkUbCbFvoP7jk9xFhk0ezSx911eyysjR+tRPWeVg+STGoSwmaF0xoKqBk0QQTwIAl4oHgzndR9XiXjy3l1V9E1J8jAQWClWvxYJMpYpsA83jlnpQwQtKJdkGywff2MLIjsjNlEb2bfrJzHFbc2Npjf+X8IdN/e3+0UdqyE5PQHw1fYLDS0hAQNZhJPrIitiYpCy2/EVogS/C7SbiSUav7wBtgF55+YTQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB4306.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(396003)(39860400002)(136003)(346002)(366004)(376002)(451199015)(36756003)(8676002)(66946007)(6916009)(66556008)(66476007)(83380400001)(2906002)(6486002)(41300700001)(5660300002)(8936002)(478600001)(6512007)(2616005)(186003)(1076003)(26005)(316002)(38100700002)(6666004)(86362001)(9686003)(6506007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Y1FbUPjvEq0Cb/rrsULIje2MwmNTLVJJyQUTDhhc/5DSxL1wYWDW1AGTSEqRuShuivSXwlAWqFckx7JZcrij70zTSR2L6ABivpPHB0AeBUf2dNEYlwBzyMa1cE/qRyVn/Q+POYu2OjciPINqhukLqXPZN0ZSDqP85l47xhDHZNr++xe88jG4ouD73qg2wo75JPzQiItnNfyav8qk1COH8JMM6Ra/NLNrk1y+/7FV+IGYsT3RwwtAr3oEgbc8W07B+MA9Dbz2fGQrz09csPa+mRBoBrOlHFv5ek44v16+wzBusijPqs2lKezjfoaVhdnbXxCJHPt694GsaVjVtmp6fW+1Gp9LklVFxS1Uhj5IVRTZRU0RPUtlk6cSTn0Obhahgtvn1TI0H17wnG0qL9bdCpkTofAgME47bHCMRyjZaQQp+dt0wG1GtBB0G1OqU/mY5TuMohiHpT7N5OdkC24DSCW/RLGiL6UT1d4pr8kY8E/sw9XKZ08IEFaVq2MQJ4O8znihFsiqdGkLxHwHVq7SOPizVqV9UnKCAZYh+eVPEbCMZ2tLvhzCeuj81/sLsDx0vOWeUqaOT4B9Mrj/x+tBAcLwu6qq65iAVwsHlxIIcgMVXepZWx5lm6NB2aZPHDr9ohi3Tw8/BF9fMUhgK8u5g4cSfnL3gWJB4Fs7s9cA68F0vHxxmJ6mXD43jhvGjGs6fQeFXPWSCGjePEr3SYBXdSVBer7tosNC+sI35Dk5qWagq6xmyuzQFJM8T466Yoyw66nf2eYwVBZQy5LuW/qn05X71g3Osvz9H/bBgBO6gmgQAIIMULetZAQh2ZZ05HZSQ02N02RoQqvHg6PmzY3TzD1dBcT1jwbB/xA5E9xCuAfIYTrTY67mKkHgUETa1CLrxoEeSsIwfWB3Q5c5Bd/P0vj++d6093+jwuzCELj0MfPZt9C358VRPiaeDCz9U+oH2nWT2NTngUhJoJacBwHSmUDNBizjB6yUH5CFsalVonCU/8m7/tobrJZY2meAH+xDZBChsmMMaDR17FKghPLC+A73DnU2bVVj2faFLgE0cl6zHSvwAd705GRjPDAD4ihxSQ8hrzjjBuV9wJrhiRf+oE/FgVTpyTJ7FEQUpmOg1ES+I7vmi/Asee1JC3d+Z3QYKLarOJmy4erW0OtAaJB3Av5HVxwHV7M3+OWkCKFM5fXdWIaiAxIPsKjAjDZIljz4Gd2VMmeT46b9yit/+BEvHtHqSCt/t/XZIktmwwtvckqKR1DxRC2Bja1WWJ3wZunNCwdY89o1pq6DxJCoSxmNshK0gcXclwp/Z5o9grnQg6B1p0+kOB+noKPStyJARAqMYbJWahA8akRViI27vfhjap0aIl1U75pqzWs6rBAwLrOvjMZMjpFcpuWpfFNlsoY8lK0vWoz/65he6wlbxH4VwmJhDowtWnYCh/k69EBgb65G0tZppnIUrpKNqA33EQEs+4WShIwoNoy1qXMfmYZ8r3GrW1HnPTVXIeiHEzkWnVng6BlazMINsLd7ke6Jfqgpvq6IAaipvvNSTH4e2ab2pASyoPeeguK3kjuWubIcygaOmsGnlwsJorkJvmV1YvBWllKKcbXcgZNPgBxawIXBdA== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 19cf3c95-8091-4382-a052-08dac09ebb53 X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4306.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2022 09:02:00.7470 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: mOrVFsCG4OWhTebJuxQHAhZULVvwXVaB9Q5ZH4aPvpkDrX0c7yYJoT9YNETmfi2i8t7Ej/dVMen1WwBeDY9hW57D9Vmm1Tf63cYjiWu47hE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5848 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-07_02,2022-11-03_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 spamscore=0 adultscore=0 malwarescore=0 mlxlogscore=999 mlxscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2211070076 X-Proofpoint-ORIG-GUID: 59t8770VASD1JmvsqTdXmNnDAd6E63Vz X-Proofpoint-GUID: 59t8770VASD1JmvsqTdXmNnDAd6E63Vz Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Allison Henderson Renames that generate parent pointer updates can join up to 5 inodes locked in sorted order. So we need to increase the number of defer ops inodes and relock them in the same way. Signed-off-by: Allison Henderson Reviewed-by: Darrick J. Wong Reviewed-by: Catherine Hoang --- fs/xfs/libxfs/xfs_defer.c | 28 ++++++++++++++++++++++++++-- fs/xfs/libxfs/xfs_defer.h | 8 +++++++- fs/xfs/xfs_inode.c | 2 +- fs/xfs/xfs_inode.h | 1 + 4 files changed, 35 insertions(+), 4 deletions(-) diff --git a/fs/xfs/libxfs/xfs_defer.c b/fs/xfs/libxfs/xfs_defer.c index 5a321b783398..c0279b57e51d 100644 --- a/fs/xfs/libxfs/xfs_defer.c +++ b/fs/xfs/libxfs/xfs_defer.c @@ -820,13 +820,37 @@ xfs_defer_ops_continue( struct xfs_trans *tp, struct xfs_defer_resources *dres) { - unsigned int i; + unsigned int i, j; + struct xfs_inode *sips[XFS_DEFER_OPS_NR_INODES]; + struct xfs_inode *temp; ASSERT(tp->t_flags & XFS_TRANS_PERM_LOG_RES); ASSERT(!(tp->t_flags & XFS_TRANS_DIRTY)); /* Lock the captured resources to the new transaction. */ - if (dfc->dfc_held.dr_inos == 2) + if (dfc->dfc_held.dr_inos > 2) { + /* + * Renames with parent pointer updates can lock up to 5 inodes, + * sorted by their inode number. So we need to make sure they + * are relocked in the same way. + */ + memset(sips, 0, sizeof(sips)); + for (i = 0; i < dfc->dfc_held.dr_inos; i++) + sips[i] = dfc->dfc_held.dr_ip[i]; + + /* Bubble sort of at most 5 inodes */ + for (i = 0; i < dfc->dfc_held.dr_inos; i++) { + for (j = 1; j < dfc->dfc_held.dr_inos; j++) { + if (sips[j]->i_ino < sips[j-1]->i_ino) { + temp = sips[j]; + sips[j] = sips[j-1]; + sips[j-1] = temp; + } + } + } + + xfs_lock_inodes(sips, dfc->dfc_held.dr_inos, XFS_ILOCK_EXCL); + } else if (dfc->dfc_held.dr_inos == 2) xfs_lock_two_inodes(dfc->dfc_held.dr_ip[0], XFS_ILOCK_EXCL, dfc->dfc_held.dr_ip[1], XFS_ILOCK_EXCL); else if (dfc->dfc_held.dr_inos == 1) diff --git a/fs/xfs/libxfs/xfs_defer.h b/fs/xfs/libxfs/xfs_defer.h index 114a3a4930a3..fdf6941f8f4d 100644 --- a/fs/xfs/libxfs/xfs_defer.h +++ b/fs/xfs/libxfs/xfs_defer.h @@ -70,7 +70,13 @@ extern const struct xfs_defer_op_type xfs_attr_defer_type; /* * Deferred operation item relogging limits. */ -#define XFS_DEFER_OPS_NR_INODES 2 /* join up to two inodes */ + +/* + * Rename w/ parent pointers can require up to 5 inodes with deferred ops to + * be joined to the transaction: src_dp, target_dp, src_ip, target_ip, and wip. + * These inodes are locked in sorted order by their inode numbers + */ +#define XFS_DEFER_OPS_NR_INODES 5 #define XFS_DEFER_OPS_NR_BUFS 2 /* join up to two buffers */ /* Resources that must be held across a transaction roll. */ diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index aa303be11576..2e7d43ad770e 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -447,7 +447,7 @@ xfs_lock_inumorder( * lock more than one at a time, lockdep will report false positives saying we * have violated locking orders. */ -static void +void xfs_lock_inodes( struct xfs_inode **ips, int inodes, diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h index fa780f08dc89..2eaed98af814 100644 --- a/fs/xfs/xfs_inode.h +++ b/fs/xfs/xfs_inode.h @@ -574,5 +574,6 @@ void xfs_end_io(struct work_struct *work); int xfs_ilock2_io_mmap(struct xfs_inode *ip1, struct xfs_inode *ip2); void xfs_iunlock2_io_mmap(struct xfs_inode *ip1, struct xfs_inode *ip2); +void xfs_lock_inodes(struct xfs_inode **ips, int inodes, uint lock_mode); #endif /* __XFS_INODE_H__ */ From patchwork Mon Nov 7 09:01:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allison Henderson X-Patchwork-Id: 13034123 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5F615C4332F for ; Mon, 7 Nov 2022 09:02:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230427AbiKGJCy (ORCPT ); Mon, 7 Nov 2022 04:02:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33390 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230470AbiKGJCx (ORCPT ); Mon, 7 Nov 2022 04:02:53 -0500 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5EDBD12AFA for ; Mon, 7 Nov 2022 01:02:52 -0800 (PST) Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 2A78uatg012294 for ; Mon, 7 Nov 2022 09:02:52 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=q5KRAzVkZpM1zPPDkY7MXbl0kqn1n4tp+ZgYkKUpynI=; b=jo+EkV1t/KLriw3gYZAmJPJTMpBCCV59lEpGRK2T4aDxMp4yWA+OW/g6SSUHIsJISSoN nD4MsT0M/U6ZDv4DE1/VbdOpQo4/VmXPw2C5KLBJnm4Mhc3kfdoSd6Xmz0nMNa93zvU4 s5z67VNPzVf6CqAv5vYY7RfkrY0Kdi93ZEBRxs9uhQr0A11RhYjdVsUF0athezo37ClZ xC1/yDV1bvkjDi5KlYbeLTjOchjE4//vDVuKdm80B2s2JXiQzmkXBnsBmhDf7MqZLiav mVhje0BqsLT3bjBK+ywOK+obgHseeEUXqDe6pATWfBVCMoqn+rmGe8l/S4AHqMn0TzEe 5A== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3kngkfu7tq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:02:51 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2A77KaVf025118 for ; Mon, 7 Nov 2022 09:02:50 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1anam02lp2048.outbound.protection.outlook.com [104.47.57.48]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3kpcqek67k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:02:50 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m4BYmxMRNP9+hqg6OYI7TkdcdxNTIY32+GfCE+5g8rTwT2Sp56uSph4z5hIFhn1Z6eWEr42iGKPZAsFdpQY87OdGhLgGxxaLxdRiNdMyEU0LykdtsqkLaBn4yJ2vDTorNFBSRTWn+x3QDdbxl4lb8qRBE6E8t3u2Q7o0qRHvZSdTdknOM9MteoamTIKQqHiifP1x7m7TLKElQhLnI60KHEChjOewgO/k/iKClBPR97w3zVSmTI01+HUDyzGvRLKJ8YSWicx6O1OnvfMoaZlhf4YK9v1HxgJ39rD62xvJgTAH/lDlfQVc+fheg4viuCaKcuUyz1pMzOcjWS/XHGlkhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=q5KRAzVkZpM1zPPDkY7MXbl0kqn1n4tp+ZgYkKUpynI=; b=SP7y4CW+geaGWSsQCRnlpxwAPak7EcLnhudNQrsU3w1mL3yPbJOJS6bPUSps6Ien9eaH/SxJh1HWVRODVxG4xWmKWPNXb7D/RQh5VVq3HhCSDy70U0ddGiYh5ZBtrJyeFDaL9+pn5jvKH+YY+DE3OciL3yOpGFGYesAFsgamF8HVOo+/w2mjPmcAK9qDRhlh1iwuS4Mk9FMlcxlzhg9159pR5CvWZYGqXnWK5XZA8Svvt+a3AOhnVl87aAehtz5Kj7pcrfHHcCNUKIT6DQgRDNpdkCQqirgqINU9wM+sNNR5NNTxZO8pnHr1o81wE20Z+19uwBH/F9c71ZecCfEXjg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=q5KRAzVkZpM1zPPDkY7MXbl0kqn1n4tp+ZgYkKUpynI=; b=M+toBXHBr9t+BPijG3oVltTsHd0dDm4MkmNyuNMkus6IYenhcDS4AlvLMVPXxxfstFyyCD9lb7sEa9pyARq2v71vS0D10iX59Fubww3y/u6NcKMmn5lSRUpc2hJRaqXnq10QnJOX/V1IfnPMC3HFM+fxvs+ctF2SeqUivWCVrvA= Received: from BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) by PH0PR10MB5848.namprd10.prod.outlook.com (2603:10b6:510:149::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Mon, 7 Nov 2022 09:02:48 +0000 Received: from BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3]) by BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3%4]) with mapi id 15.20.5791.026; Mon, 7 Nov 2022 09:02:48 +0000 From: allison.henderson@oracle.com To: linux-xfs@vger.kernel.org Subject: [PATCH v5 03/26] xfs: Hold inode locks in xfs_ialloc Date: Mon, 7 Nov 2022 02:01:33 -0700 Message-Id: <20221107090156.299319-4-allison.henderson@oracle.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221107090156.299319-1-allison.henderson@oracle.com> References: <20221107090156.299319-1-allison.henderson@oracle.com> X-ClientProxiedBy: BYAPR07CA0035.namprd07.prod.outlook.com (2603:10b6:a02:bc::48) To BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB4306:EE_|PH0PR10MB5848:EE_ X-MS-Office365-Filtering-Correlation-Id: 892fa6ae-0168-44cf-d819-08dac09ed7f5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5hcRCVC7bQjN5VVOKScGWfc7lp3LsK0Pqi572vVVnVnFSvzaRmj/r8geaLAdd1t3OjkrsxEtKyMH74MRaF1wjDFL205vq18ay4e8N4XXkitE4dcW5mDyrJcwjmijAgzn8Y6DKezqQkMzVwB5wWaow8WWIPZfqvfJOzELRS1M9nB/ujPyfO7bQx75F9UH8P4kLxBtJ48gB2otjoziZRR5bLsWw2037ppEvYGwc1kcngY73H2WTyZaAd0sIhsUkv3sMXz6HrHytaW1IKwbQFp0uYCYfWHOPMrDjN7tiwEIPCrxocyOp5cnDTInxwryUifVUtyWlJRDUFNKQq3L1zbuxOHiE6tmI47DO30+wrccMbVlOP4RVRQ7SrE4VQtOBWWZbXyL8P1R5+kR0PPAVTl5bXFP9U0AmPM5vJ1NeSB526ICH0VeTFVpgLDf/CxGTI3pEaxmqu7lcrO36W11lqcEccOodXtm2SLGzOpEfnAMUN3DWl16ns4o9NA9CO2leofKH+INSXJtlMIt5MgLebhBvUb/486DOiOClA2XO89DWipFJ5sCZLdwbzztCyxrGIViZWdRZSYXM2CanUm0olnE09Jh4xpwvX5iTnfhDmMBxm+Jax1eqESczqhPZ9yK28ZJQF4jCHR0LIW/k5loyoX7L37kKrZlYdri08dz87Q9Na+PFV7jyXCmVZoKbLmjcxG+rrDPUcQlhjsGgzyTsJN9XA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB4306.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(396003)(39860400002)(136003)(346002)(366004)(376002)(451199015)(36756003)(8676002)(66946007)(6916009)(66556008)(66476007)(83380400001)(2906002)(6486002)(41300700001)(5660300002)(8936002)(478600001)(6512007)(2616005)(186003)(1076003)(26005)(316002)(38100700002)(6666004)(86362001)(9686003)(6506007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: noSNg3Ts42XZD+OWNptha1HjY0IVlvw12haP5qoOc4hs4xRRLxOGqvYNZH33imzLmrfCDUUz2gfhhqdmjk+obS+kZYhChDdneRqmRQJa03uqVDVGbIvZGBcT7VuCDTPOGNEC3oJ+deY/L3G7zbpwpFk+DcFJwXa+93/+VOuoUsqllLluNM4uMgJub70N24NpmZUCsGB21Cxal3wjktrh7JHy5TN/CT4w5EXwEf2EBCej71JFAP3J0p7F3Sf7h+uOk3hqzHJhGlKsoeibv7eR6slid21Dit4qeLxxiGUKT48hRujwUxOn8EOvuhQXsEoW8cB4F8CufIgeRU784/S7PkUHR5mOTp1tAgWJtnswvXhDLI/IccWkBJzoz/cwkxb/Lr88kB0jmFU6XPqSc/ckD/xFjw8mc9koSyu/X3YW7uAWQ32xIy3EIA5c/0Ti2pNd+qrsqIx/q3SU43ZFwkGA2884uC0EaPXtbkzWDNhgFVsKAIuHyAmWe1uLjONssZIaNFxPIBf2jVd14h7sNH6WFeN/KzukwFbEV6yCWcQcrEoGuM2Mm9ax8ErKgqfaCc0gQ5R7/YEp48vexIvJUC3syZbvfzv0aSVVea0tDdxAuXdvHTwD1IMms0mrvsm6T7VaDn9wX2JUwkjQidPNrA3n80DrbKTWmZvBpz4U9PPUBeFa+yoT+IGTdqIWvtNnM4hounArrIlev5ZD7fIbI9hgq4XVDO/AOwZBmepyK/fZnAj3VjylQeaK+4laLwBl/RUDxqnCKbYCFix1G3GWXlMlRrMmRiPCM8WNaZl649MesKi4MGbPcxlfk+zow/sbZ6ZQqWps8gu87OzMLY7v+SPORgVLDreip03+nTlEK4WacyTRkNc45a7KXuwpA/zt3FagweUQ5sM7/L4PgyDywvi1s8fEiLOiSVpo2MYo+nZQqIk+8cGfweHoUR6pxwqKV1+Logi5oI2WswWirsOdvLi5idyw2ynoDNE3v5wjuBF+zsSXSol0XOKGhYhelghb3+51ZII3AK5wqWWPMEH8KuLb7NOm8T+52juepNbSy21tkRbwG9M+QT4Hnhjg4ruB3LAPACjNQE4la3R+zt0k1Y9gfsDs3wBXtuwhEyL16ocBarJNERj5+hFYYOWwdVMi+M6bQqCvdFQ5Bq+/mjpsRAaS1wtvxGmCPSg2lsmvS5c/ZLK2jHZrc5feinxEwN5c5Dqhprv+yEFORjnuARA251r8nMIunMDzQ2M710GNJhBIK2b8UVHWYB9ENiSdeJlgeiKawwzKk7cy7XR1ypU1N4gFeqsMlR2p5vuDCjjiF7jvOEjWWJjcUZt9Sqav9Ogq8hYMYcHmeUHD4GTmNnmJ1ItNjetcNMgjC3SOsK/+fVhPCrYuYMmK2cbfZt19NExPmUfZ6OEAmfNp1gu0QHk4D9QUWdqVQw3Vyhd5TXiP8fw3IIx51Rs9Q6+1wvcsG7BVr/unHweJin2Tel2U0XxOMY4N99RSDeFsolHPOsIN1rbA+o1hfzDNwgXQUzHX9H0NdEbfPFMVqmy7HybPL2X9NYP6YXN1zCESCtKstKkR//6rToe0fMusr8oBsdPlACL9RQy+RTPoeLu7DmJMnBUI0d82VQ== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 892fa6ae-0168-44cf-d819-08dac09ed7f5 X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4306.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2022 09:02:48.7862 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: NcWrZOhdHt3jAmRHg5MR+PKWLVn3z2ANe4ypcoHajx5p62jTjWISZ4Of+rbk8nlF6k6v5K2BawHM7M+p1mFZ4oc1BMawX9LgtnapJGUuGM8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5848 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-07_02,2022-11-03_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0 mlxscore=0 suspectscore=0 spamscore=0 malwarescore=0 bulkscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2211070076 X-Proofpoint-ORIG-GUID: IZLPSwVYk5U4j0hstv01mqvvUqZmv3DH X-Proofpoint-GUID: IZLPSwVYk5U4j0hstv01mqvvUqZmv3DH Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Allison Henderson Modify xfs_ialloc to hold locks after return. Caller will be responsible for manual unlock. We will need this later to hold locks across parent pointer operations Signed-off-by: Allison Henderson Reviewed-by: Darrick J. Wong Reviewed-by: Catherine Hoang --- fs/xfs/xfs_inode.c | 6 +++++- fs/xfs/xfs_qm.c | 4 +++- fs/xfs/xfs_symlink.c | 3 +++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 2e7d43ad770e..eebbff3b5866 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -774,6 +774,8 @@ xfs_inode_inherit_flags2( /* * Initialise a newly allocated inode and return the in-core inode to the * caller locked exclusively. + * + * Caller is responsible for unlocking the inode manually upon return */ int xfs_init_new_inode( @@ -899,7 +901,7 @@ xfs_init_new_inode( /* * Log the new values stuffed into the inode. */ - xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL); + xfs_trans_ijoin(tp, ip, 0); xfs_trans_log_inode(tp, ip, flags); /* now that we have an i_mode we can setup the inode structure */ @@ -1076,6 +1078,7 @@ xfs_create( xfs_qm_dqrele(pdqp); *ipp = ip; + xfs_iunlock(ip, XFS_ILOCK_EXCL); return 0; out_trans_cancel: @@ -1172,6 +1175,7 @@ xfs_create_tmpfile( xfs_qm_dqrele(pdqp); *ipp = ip; + xfs_iunlock(ip, XFS_ILOCK_EXCL); return 0; out_trans_cancel: diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c index 18bb4ec4d7c9..96e7b4959721 100644 --- a/fs/xfs/xfs_qm.c +++ b/fs/xfs/xfs_qm.c @@ -818,8 +818,10 @@ xfs_qm_qino_alloc( ASSERT(xfs_is_shutdown(mp)); xfs_alert(mp, "%s failed (error %d)!", __func__, error); } - if (need_alloc) + if (need_alloc) { xfs_finish_inode_setup(*ipp); + xfs_iunlock(*ipp, XFS_ILOCK_EXCL); + } return error; } diff --git a/fs/xfs/xfs_symlink.c b/fs/xfs/xfs_symlink.c index 8389f3ef88ef..d8e120913036 100644 --- a/fs/xfs/xfs_symlink.c +++ b/fs/xfs/xfs_symlink.c @@ -337,6 +337,7 @@ xfs_symlink( xfs_qm_dqrele(pdqp); *ipp = ip; + xfs_iunlock(ip, XFS_ILOCK_EXCL); return 0; out_trans_cancel: @@ -358,6 +359,8 @@ xfs_symlink( if (unlock_dp_on_error) xfs_iunlock(dp, XFS_ILOCK_EXCL); + if (ip) + xfs_iunlock(ip, XFS_ILOCK_EXCL); return error; } From patchwork Mon Nov 7 09:01:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allison Henderson X-Patchwork-Id: 13034124 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77BD1C4332F for ; Mon, 7 Nov 2022 09:03:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231304AbiKGJDC (ORCPT ); Mon, 7 Nov 2022 04:03:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33536 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230428AbiKGJDB (ORCPT ); Mon, 7 Nov 2022 04:03:01 -0500 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9BD6F1659E for ; Mon, 7 Nov 2022 01:02:59 -0800 (PST) Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 2A75fMHB025318 for ; Mon, 7 Nov 2022 09:02:58 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=9C6WeaxO10Iugr6OQPyyw7HDzTrL7IVfsbTxKy/l7RE=; b=SgHFKx1tYyIK/TgBp/j1QMuhkAWJJzKW+f2TC6VrdTZKoAGttcEp4hEGCggCV6cf1Y2F aSf5/Jn/gBoZDRJMzcHXfhxsusDXPM9YnN2IBCjLBOmSLTrZJB34I5Boex7Q/cvbzY5G 93dSnSq9MUYC0Um/QFY3gYoinrEjcGm2fOdPu5pdH3aYdQB38/56yYyjhWpqZh2zdPuP TI8HyNtaZIffQr3/BHZJ1LmFcRqTEWFBu/7H/7qlAptgcbXOOGEiZaZR7JNkJfwjrkGr wf64mo8rEDMl10+RvB2ak/FX1x3UV7oVyUq1sjg+JsHqjB1/Me8P9lhRVAMPABW9UeLH sw== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3kngmj30h3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:02:58 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2A784nKd014429 for ; Mon, 7 Nov 2022 09:02:57 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1anam02lp2043.outbound.protection.outlook.com [104.47.57.43]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3kpctatkrf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:02:56 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HrmLvSxJ22DLMEQ2upjPmzFTZbvb31FK9f8jU/W6pPfh0EbJTwJKJ7sqygps7WZDkWYmuWWev1eHH97KXCHMqkzQLXyihHmDJvvCwptHI8CKPFUQwTXg8os3f9y+KgStht2fimQE8de7vQb4TQkM7OosWr+s4rGs23V5/N5bgkyZbCFr4hw9ZbYHysrZ1pDLI5ZqPK8BNCXzXje+EJt4n61ArZlaXnKa/8E5nisW7wzfMxriwYSFkVaheQs7jsretLVqBiCFhT72kR0DvaBq9DsumzpA34B44y3NtNL9P4r6QwfyHcfFzg1tEoPEs8fvwbxmYBp+FcKcjzkdwpO7yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9C6WeaxO10Iugr6OQPyyw7HDzTrL7IVfsbTxKy/l7RE=; b=bDz3+OWMVtQ8WhNUEgL06G5uw6c0xB2PUdrIe4kSI4tL3GBjIrfBPCYnuJuHc8LowMVkyU32m0/mo7ZsbGnhgb1NLcDljIPvm08mb8Ong75C5dPzBgj8e3eDeJgUzomUGrvOP8Z/wyh5236pCL7Pr1kcXSPbc/V1GCTZHRkqUS4wcn3qvb1u95WS5qZBLgUlENeY5DOvUO+dTHrVltKzTbGlAtTg6kBYrN6wgcXu4YDC4I/Ai+Ul9AVlEIW9ggimzfpnEf1YSphRtmTgoga0mC4PLqXsbDwB+Eu3yB0C4M7nQ5FUnu29BX5hDnS4dndH0qYQSPBOk0/9BX+7eEgBoA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9C6WeaxO10Iugr6OQPyyw7HDzTrL7IVfsbTxKy/l7RE=; b=gVuPvEnuvcCjuhQCvP2bCjFKh6jIJZhzzZP1xEM83/OHWj/J/vioX8xK+cIaYPz5Ik+7I3K6Pd/0I3i9/zJcwnmIwICZliyIWcf3K7TwHYdIoMHVwS3CurfMiSxCrCOUyMY8zSovocPjcn91slsXN+XlG2uPS/AKmd6welLfVOc= Received: from BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) by PH0PR10MB5848.namprd10.prod.outlook.com (2603:10b6:510:149::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Mon, 7 Nov 2022 09:02:55 +0000 Received: from BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3]) by BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3%4]) with mapi id 15.20.5791.026; Mon, 7 Nov 2022 09:02:55 +0000 From: allison.henderson@oracle.com To: linux-xfs@vger.kernel.org Subject: [PATCH v5 04/26] xfs: Hold inode locks in xfs_trans_alloc_dir Date: Mon, 7 Nov 2022 02:01:34 -0700 Message-Id: <20221107090156.299319-5-allison.henderson@oracle.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221107090156.299319-1-allison.henderson@oracle.com> References: <20221107090156.299319-1-allison.henderson@oracle.com> X-ClientProxiedBy: SJ0PR03CA0190.namprd03.prod.outlook.com (2603:10b6:a03:2ef::15) To BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB4306:EE_|PH0PR10MB5848:EE_ X-MS-Office365-Filtering-Correlation-Id: 1e9751ac-96ba-4c84-0243-08dac09edbde X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rYWPfc30J+Qbuyap4LCQ2cjjacQs1iWXgPN0k6/OVUMG3g+isX9g8uVqrV5THdajymCXmYVihyASziDnqaa5cqe0hJyuYooy85fbjZVu+Jb2KR872LFM3oXrQbvjwL8aNmsqfe20BwmbhcOvd+EmY28dUjbv2vIqju8vuIUk5osqj3eINyjDGIn4uZDUHH2PQ7bbmDF+vZ5V7qRFOLlg6NQo+kDjEGoJO02Wq0EFr71wh4wYydOAglLChSzvjZOzB7gmUgLUoIJ3RfJfxb+x+jeRRB6YHFIHwfJ0zIThnXquCCSUgw/t8xDXJebyAu+6saKQ9r5jk/CIFsaX7IFIYRyrVzsXJdzllj8fVr8yuTIi3pd2fVHrLRwCc7X08dqFA7IneFjYvBL9M0nhHBaquk3H7YNqSRdGd16ZTX1ZpcFPaYC9IDCzwui8fQUXC4aj6u0SVxzsKpiK3XDZOisjbWJdziSgKofT9oiXmqyPHc24LsR/6HKwzG/gLBpDNk3Ugr1Hrrdiqj7QDhXNXn3xzh5B6PFLCanUgRNUE3FPbIlFnwVZj2X1UuAEzn9MA/M4YhGZAHEprsyUFKtDGGs2a4rzsBwmO5CB2pGMyRLVZ5dyquRk7A1fTIdPhgIpvPy7EaqI5bvS1v7iHRkbO64HmCbHBH24YXhw/JMRTgeL8HlqfasiDmeuLbuYsxCzhUd6v3dUydmpYe1UQ3j6zBOvqw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB4306.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(396003)(39860400002)(136003)(346002)(366004)(376002)(451199015)(36756003)(8676002)(66946007)(6916009)(66556008)(66476007)(83380400001)(2906002)(6486002)(41300700001)(5660300002)(8936002)(478600001)(6512007)(2616005)(186003)(1076003)(26005)(316002)(38100700002)(6666004)(86362001)(9686003)(6506007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QofXGL8sm4OYVtr8Dc8U/EcZm74wRwWKDTRa8P9Ib2sVAOPOI1YaEL9gEW1WnUuQJXiGX10G61yRVlYzDpZrTKXN/j7rnfRqjZ4whz/pgBUN8Da/bKaSMWLfbSAi9n0K5hc8/8/FHmsUKafrv8Dwv8UxNz9NxTyr4GHGg440XMWfvZSE7iD0rplHDZp3qAPywAX6rbexj/p7RsFdPS5deAkRP9v8W/joCBYEEuV9uPhAowbFRTa4mJCSYUb91JJdEwjkgIslYqyJ3SVe7PxKDd/bpQwgiWuML4X5prQXNvN/64PnK2+TF8cn3acfZ+pHt32VPr6XMhQRggJ/mtoyMRIguFTioP0CW4bhY6MCJNk/IpVx399KKCnVrUvGsQ4uyFQ2H4UPOTOZWPZjOIGVQ0zIh1lUGj710aZH/Ah28dsEygu5wlPWQwcX1YKNxNtE01zsF+o7FO7AVUgqDwIukMwXaMCQXqAnZs4bucjIw9P3trAyl0QZVuS5cCZecvEFQNEOrIFhLIagpkoizRRW08VZGPczZRuDmzo1VS0GrEQAQ0vNOEIeNUBtyJQQQaIWUf/b4EZ7gXq5QjwAVPEpJWWP26xyD7Je7j/Kmu15QkQgtEf8ZhNK+o6HsuBQRuLrltxON2uUwUxnokDrl3j6u5HyGpGkr9GzN77GaPIeTGBZZNuMxI886z4FdeE3UTxu5sX1SgJEMSZJag9Y8EdnutS/k/lSUB9flqqHMR1D+DyUd+wbZQm/ioaZMRF3p+qeUBHXGQJhMSI2DCjjEPTSRYPbH4wYqZfvqZS+9o0pqv1dzo7XlD62Q26j5CIAaQwasOdx2pUBH5UKY0+aH4ytZ8jnMJFcMmJZDcOdEe5g2oemtPPViQPdEdIBWy73FGma06503iRJe9Rq9mc4tbiq8wTesKaU/qcx0xbdhn8L1MvfAmwSknMmneMHhExYtZlhX6u93niW/2vH195tJyAjIyheq/Cxm4uUcGLraEq6kbQioJPDGZcf5ulDyWz3NwsCqdQH865hKcmXFi72Zpm0TaeMrkuDnPqCQMxRw3uu5GPA2TXoaXGOYzp0hugPrdoMLmcViDqewwozibjRPy1CsVWCqQwCQkvPSo5UuDxuKVeMmPITjdoctyew2hx2tQrUDlrLkt/okZpSSRbR7cIrxt31KRreXuC6wu6nXgp7aNL2BmHOb8KbTMLgkzlB38vQ2PLRKn3c9QChMkgxLw518/zSD+4o1IK9woRrEgbvrWAC24nRxluZebyOW6KbT22hPfq4F9ArmAjU+oN3MUefVP+AeRSE+hn4S0SBDt5QCdamG+sl9ivY9BVTzfik5I7b9hTgfooGqNOeWZdPAJh0mSeyOoLNz/1uStT0fEOx9D04zBoceB4q+53N1egPQVdj8DF49qy2kk62STvK+beWjwHkXhwtW4JfKBGJ4f3eom4zWb4swAkLijMQjOSVNlbj+C+mSiBS6YhEGil4vTFJPqO8DHMP6KLqDqcFDWGUQd7uCuXbwNSka0p92L82EUJGZMFPnClyWn8GeK3JF2QgRVebGO9kzQXBQF+mpX5NFeBUt2zaKCyhZTW7En4imq5d7icmVJPoIvdXIafKHrxQQA== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1e9751ac-96ba-4c84-0243-08dac09edbde X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4306.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2022 09:02:55.3253 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 7e9EsV4+gQ+V/6teGrOI0PmQqWdmiFpWyb3bfJFBDDLvAZZnfyjRPyzfZsy7enuoHQqu2rLicJtPqTFPuZvjk4f0BhyfiOkmQj9wIIhfbMc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5848 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-07_02,2022-11-03_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxscore=0 spamscore=0 bulkscore=0 suspectscore=0 adultscore=0 malwarescore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2211070076 X-Proofpoint-GUID: itauGU3OD0aBg1f_42uckKplBRILCR2u X-Proofpoint-ORIG-GUID: itauGU3OD0aBg1f_42uckKplBRILCR2u Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Allison Henderson Modify xfs_trans_alloc_dir to hold locks after return. Caller will be responsible for manual unlock. We will need this later to hold locks across parent pointer operations Signed-off-by: Allison Henderson Reviewed-by: Darrick J. Wong Reviewed-by: Catherine Hoang --- fs/xfs/xfs_inode.c | 14 ++++++++++++-- fs/xfs/xfs_trans.c | 6 ++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index eebbff3b5866..eb4a9c356e77 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -1277,10 +1277,15 @@ xfs_link( if (xfs_has_wsync(mp) || xfs_has_dirsync(mp)) xfs_trans_set_sync(tp); - return xfs_trans_commit(tp); + error = xfs_trans_commit(tp); + xfs_iunlock(tdp, XFS_ILOCK_EXCL); + xfs_iunlock(sip, XFS_ILOCK_EXCL); + return error; error_return: xfs_trans_cancel(tp); + xfs_iunlock(tdp, XFS_ILOCK_EXCL); + xfs_iunlock(sip, XFS_ILOCK_EXCL); std_return: if (error == -ENOSPC && nospace_error) error = nospace_error; @@ -2516,15 +2521,20 @@ xfs_remove( error = xfs_trans_commit(tp); if (error) - goto std_return; + goto out_unlock; if (is_dir && xfs_inode_is_filestream(ip)) xfs_filestream_deassociate(ip); + xfs_iunlock(ip, XFS_ILOCK_EXCL); + xfs_iunlock(dp, XFS_ILOCK_EXCL); return 0; out_trans_cancel: xfs_trans_cancel(tp); + out_unlock: + xfs_iunlock(ip, XFS_ILOCK_EXCL); + xfs_iunlock(dp, XFS_ILOCK_EXCL); std_return: return error; } diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c index 7bd16fbff534..ac98ff416e54 100644 --- a/fs/xfs/xfs_trans.c +++ b/fs/xfs/xfs_trans.c @@ -1356,6 +1356,8 @@ xfs_trans_alloc_ichange( * The caller must ensure that the on-disk dquots attached to this inode have * already been allocated and initialized. The ILOCKs will be dropped when the * transaction is committed or cancelled. + * + * Caller is responsible for unlocking the inodes manually upon return */ int xfs_trans_alloc_dir( @@ -1386,8 +1388,8 @@ xfs_trans_alloc_dir( xfs_lock_two_inodes(dp, XFS_ILOCK_EXCL, ip, XFS_ILOCK_EXCL); - xfs_trans_ijoin(tp, dp, XFS_ILOCK_EXCL); - xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL); + xfs_trans_ijoin(tp, dp, 0); + xfs_trans_ijoin(tp, ip, 0); error = xfs_qm_dqattach_locked(dp, false); if (error) { From patchwork Mon Nov 7 09:01:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allison Henderson X-Patchwork-Id: 13034125 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1668EC433FE for ; Mon, 7 Nov 2022 09:03:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230428AbiKGJDD (ORCPT ); Mon, 7 Nov 2022 04:03:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230470AbiKGJDB (ORCPT ); Mon, 7 Nov 2022 04:03:01 -0500 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DBA58165A7 for ; Mon, 7 Nov 2022 01:02:59 -0800 (PST) Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 2A77rhg5014980 for ; Mon, 7 Nov 2022 09:02:59 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=6/CpM8uOcsaH+T2myRt881ZNxiH9A2jc39CdpScZEMg=; b=QFPWkq9pgSwaVNVE+PXz2suH7QKNSQF0e/LzPgiTqdPV5fEZPjiKjXA5K+RgeE4ubDKm 9D7OHECKi3VOkxaN6tWxf4SXOOi7tjT49ElUuRHHCL1vEXSICfsi+ja2IVd0v5BjVIq1 ksK2FsCIReQT1L7NMbD3GeQeiwOsbn/UrQgLOkI7687BsFavkDGRwE4At6SJyRC5aHU8 l6J6MKafCXCIJq2gG52I3R+cx0bwMYmw9PtDI7rpLsAHRop952jE3Qq4FQJ5MdAtN+RD rzbPpn9t89qPhZHt3Pz5f9xB4WOj7cPdpxGIfEOfGecJTtvDRQK/ZAfwha/oDkEZE3x3 Nw== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3kngmj30h5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:02:58 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2A784nKe014429 for ; Mon, 7 Nov 2022 09:02:57 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1anam02lp2043.outbound.protection.outlook.com [104.47.57.43]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3kpctatkrf-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:02:57 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MJ9RCaJCvZkiyIGVXA3uJb06UCsWBaVxEbR9Jjspans14q+kMpl/Xqn7qswpC+YoWMD5ZCjdWOzTfYub2BcPvqxZ96KtAm2qW0g1EEnahQi5jfFaLSSW/X94aVvA8fBZG3T8BkZAQbUvSLLZAzoLIdGSf13XJpraPHnwpeAW7GvLnQaJUQkubB3PuXmFqhIs7vogl0d/uNBbGauNjtAevFzVNxrF5P2QVUJbtCYqfZqLW+VC7NgsgYcE0qFVFR2BF049RZIreHwgn5DMaQAEYfPKg4EQmgxmhc9Hr27uXLbrOMz5VwLsQumOOw8SfIIs+MshsRiWsfTV852CPECzow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=6/CpM8uOcsaH+T2myRt881ZNxiH9A2jc39CdpScZEMg=; b=APW4frHLxHEVuQQyTIWK3HKa77xXMzKmitU2N8/s80QTxT90QdkmW07yCrV+/Y8ToUyFGdX894Jwbq7yquWhVLHhwezmSs0bRKlB5zlPteda7pzq0IIAyqWvK5jdi1q7Tp4AGlISrZXLMGA3yog8wR8r078TpPipqUET3Gl0TNQeNb8ufsp4d+IYWwNmcmjZlds48JmL1s/s+wdSgrcd3df+OgqFO21p8+dkiFOIiSW1+MP2Qc18H2lXJU0T1M1IbMI/sPzzC3kYaiSg7gtST2Ov4XuOcx9lpj/5+fJgVsUkTFySkknj2DMITwpm4WAqHQBLYqZNSAwPewlsZkzUIw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6/CpM8uOcsaH+T2myRt881ZNxiH9A2jc39CdpScZEMg=; b=C4RlV2+mYKfONaEAMgdhGYshKuBghSKWaq5wKtiCfasT/Yh5jwaMUXrwkGCXxHkAbUUb0UugKDIKTjq/P93rW0flkfngjSpgcd0cEaZtOLM4JjSlyMfOe0HWW6szfVYKMIt+H7nzOp+B34NNKVZAVJh4qlbmaj78SIFYZRZxPWs= Received: from BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) by PH0PR10MB5848.namprd10.prod.outlook.com (2603:10b6:510:149::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Mon, 7 Nov 2022 09:02:56 +0000 Received: from BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3]) by BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3%4]) with mapi id 15.20.5791.026; Mon, 7 Nov 2022 09:02:56 +0000 From: allison.henderson@oracle.com To: linux-xfs@vger.kernel.org Subject: [PATCH v5 05/26] xfs: Hold inode locks in xfs_rename Date: Mon, 7 Nov 2022 02:01:35 -0700 Message-Id: <20221107090156.299319-6-allison.henderson@oracle.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221107090156.299319-1-allison.henderson@oracle.com> References: <20221107090156.299319-1-allison.henderson@oracle.com> X-ClientProxiedBy: BY3PR10CA0030.namprd10.prod.outlook.com (2603:10b6:a03:255::35) To BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB4306:EE_|PH0PR10MB5848:EE_ X-MS-Office365-Filtering-Correlation-Id: d1387704-4280-47db-1be9-08dac09edc80 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SCNngGC2nvnxRt6MkMfoUV2Fr91uSLtdKtSQ6l9oCfE+s6NGXfU8TedM1mRcVAXwlVnrc4NK+7C/ZphOE9qsejH6/J7iNXVp47pLfjbr1vD7ANG2biiH1fm9YTnz0HFmqaB4D8NTguktqSvAnIRrsaf6B1qln0LLvw1+cBKmRnT5NaOUYu3IfwqybEgyKFrA9j4MfIqzqsJb/4Ru8bbkoywoiXOW87AYKiRCsffLibfFQP1K5II4kHPnvEdZDzARiu4F8t//e/+uWHjDo4bjO+GuZWwOql2lz+OgtzuZwRCG2Az2BkqnVMNZQtd9n5KXXkOO9sFqOeFdxTOnVViUTAVhMbOZ6g7uamfZ8EclIE4wef6jaavbAv1awsILKhTicW7VBhseHFtA3aKFMtU2HXAic0k1qkqcACWKV+Id0EB+x3iRyKZgapZhUzAYO2OUHq58x18cW4ZIr3h3hvBx9SoLJ86Yo1DzLExjzkf/3XvjsXjVeYun9Py+W6r9PKi1qZa0AChhaXjDs5OnG5WRFfFYwDEyPpNRw5PYzC7OatA0MaYuS2OmHo2q41h+IjqaVQqeEPkEEpwse35E+O09Ntm+XCx6NuDaAzSkuNQjIzJr+zwkrOXvpXox+ruyM9G9jtSz5FKyVxR+Ui5CwgR5LvSyyLAOyyo0nDCm9I06TmKDygYHnA8Sd2Lgko9m+dtI7eHeUvyb/+b6xKVkRm+mEQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB4306.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(396003)(39860400002)(136003)(346002)(366004)(376002)(451199015)(36756003)(8676002)(66946007)(6916009)(66556008)(66476007)(83380400001)(2906002)(6486002)(41300700001)(5660300002)(8936002)(478600001)(6512007)(2616005)(186003)(1076003)(26005)(316002)(38100700002)(6666004)(86362001)(9686003)(6506007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3nz2ReojrlBBD2EA9yXuOW5Y2ArwwJfK+pJE6L1ffwX9FUXL+QYVRCnCBPdPFCyEqprd8UsWJJcJNn595ylV9l+eRXoD2ePCiT8t18BWzrJMnuI6Z5TyjHHCrO3tkByQ6MnvT8Sy248UmQFGu/rSbxvIs0/FIhuw+qOHQpB1YPWsmhBxQ0whfRlaDdxDGtsCxl4TnvQjSTjKz+5LA4CTYMRIuoP60gzJDwkZ6Z0TORJdQSbE71KuFaHHva+9Qgl3bz6syguh1QUjGtNEJjM295UkdlLFVQ0S1BLFqYo1FccVDbi0K5nW4GC2zZEAQmSDiKqGgYjHc80LbGcyuG8CP3hHk1D6k26wNmnmK2soLNhyMksOqmb/61ks0PFj1TLaTv4vwUcoTZF/MidOels/p0s6z5nnSIGoevdFWEuFg3VGVfyxho7M+f7FLiPrNN2XLwPbO3uYmGk3XiWjpj0NrM2ZWaKiifnV4BSkaa+8NmgN3FHNjO8HxeQsn4WnKkhIaij7TNhIBBvX8rTkkNHfa67QIC6is53Ff8aeLg650RDgwOzaXYNOy0yp/Jx/+Bjb7huj1DyL7DQgxNNjt8qECNliTlXoV8nF/nIc7jlClHOtE9Gih2tijDkW9sXRHJF5WtGKmxFMGU87MFoxOzOdRB/PfJtbOMLWhP6Z3LE6NXLOzZCNzeN7czQhrogTO06vizZIEWu4CwzdBP8myp8h2kAJw+PyTiEObR2wNnUkVP/B5bNyp53Ym4MuvTVSZFPCGNKm5MBFBeBSmEJN76mPJHccVim75YERFIcTPGzHxdIdJs43mti2MmsRkI39eg9ZNxFgttoECy0rZkGFbmWMOlgsD46v+Z676//byjnxUDAW9Ux+ZtXzjuKyGC7Xka3z6CuwV2z0LR665/MPLGwP1bVXsI5jKKYLr8bogG/pVCbh3LfGDcrAkjk3CsB7IosS0cEMreQAfhQINiU5EJ3hdlaKjiMgZxqifEzdqDK2twnAiwa7tyi4sqSz1FbYzduo9remYe2xW65J8ZJzx0sWfFOutxyjA0sXyffPPKmpI9psHXFuBUQObr+95a4FFQquUorhXe3qYbBXmV3h7EnFDYOXJDtv0mA3Ukw/9HtT10dN63/TEOatN+jCegzFTpBgo6Ysz1EZz9gYEwprd5QrUhHALSkM2Pn9boF/H2lSWs29iVyZ21tiF7iPklUsTafJBbq0ILhH5b0C+zpnTaV1GAKGC3sh16STa0US5F9r/XmZQcQ3mfiNqzadMyZhLo8n6n/tyPaspJ3y+hDDdSQ9pCsBv9C7TXKMu0B0ipWReByD91zgmuoJVAYSNvPgQtn6O6fv6chGFqoQslwRkapjXWWaYmsp+kWReyQyWc39mGx7iAll1xEWompnBSgogTel9n2/LEcXhhsNpAp9Gdi066bUu1OhTMzJpcEifjU/qX1UCCsBMDmzBWCxXqkd8DoSRRZapZoBdMsJSkGWPXzNcGWu1gkPp9g0ustRwjlqQVKI2HiAfDn7Lyvtx5R12JY3P8BqIgkyU+QNbWu88gmAA2mgRhEC/PZf60hlDlNQep8EUTnaGSyENJVtlZo0reH1X4Uxpp7LYf2Xz/vd29Sa8g== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: d1387704-4280-47db-1be9-08dac09edc80 X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4306.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2022 09:02:56.3719 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: NmC7UbwI6rLWK4c7J0wALdyTefYehFBTG5OGFHwaYX8j79/Aq/NG+oAIiYaHYDN60nuRDSjl7Lq1LX+Pto0zpfBezbZ5aV+trSbsk3MBECs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5848 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-07_02,2022-11-03_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxscore=0 spamscore=0 bulkscore=0 suspectscore=0 adultscore=0 malwarescore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2211070076 X-Proofpoint-GUID: ypHUjQfhfXSGosissdCuMO1icjECkhAL X-Proofpoint-ORIG-GUID: ypHUjQfhfXSGosissdCuMO1icjECkhAL Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Allison Henderson Modify xfs_rename to hold all inode locks across a rename operation We will need this later when we add parent pointers Signed-off-by: Allison Henderson Reviewed-by: Darrick J. Wong Reviewed-by: Catherine Hoang --- fs/xfs/xfs_inode.c | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index eb4a9c356e77..7c91a4507a65 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -2539,6 +2539,21 @@ xfs_remove( return error; } +static inline void +xfs_iunlock_after_rename( + struct xfs_inode **i_tab, + int num_inodes) +{ + int i; + + for (i = num_inodes - 1; i >= 0; i--) { + /* Skip duplicate inodes if src and target dps are the same */ + if (!i_tab[i] || (i > 0 && i_tab[i] == i_tab[i - 1])) + continue; + xfs_iunlock(i_tab[i], XFS_ILOCK_EXCL); + } +} + /* * Enter all inodes for a rename transaction into a sorted array. */ @@ -2837,18 +2852,16 @@ xfs_rename( xfs_lock_inodes(inodes, num_inodes, XFS_ILOCK_EXCL); /* - * Join all the inodes to the transaction. From this point on, - * we can rely on either trans_commit or trans_cancel to unlock - * them. + * Join all the inodes to the transaction. */ - xfs_trans_ijoin(tp, src_dp, XFS_ILOCK_EXCL); + xfs_trans_ijoin(tp, src_dp, 0); if (new_parent) - xfs_trans_ijoin(tp, target_dp, XFS_ILOCK_EXCL); - xfs_trans_ijoin(tp, src_ip, XFS_ILOCK_EXCL); + xfs_trans_ijoin(tp, target_dp, 0); + xfs_trans_ijoin(tp, src_ip, 0); if (target_ip) - xfs_trans_ijoin(tp, target_ip, XFS_ILOCK_EXCL); + xfs_trans_ijoin(tp, target_ip, 0); if (wip) - xfs_trans_ijoin(tp, wip, XFS_ILOCK_EXCL); + xfs_trans_ijoin(tp, wip, 0); /* * If we are using project inheritance, we only allow renames @@ -2862,10 +2875,12 @@ xfs_rename( } /* RENAME_EXCHANGE is unique from here on. */ - if (flags & RENAME_EXCHANGE) - return xfs_cross_rename(tp, src_dp, src_name, src_ip, + if (flags & RENAME_EXCHANGE) { + error = xfs_cross_rename(tp, src_dp, src_name, src_ip, target_dp, target_name, target_ip, spaceres); + goto out_unlock; + } /* * Try to reserve quota to handle an expansion of the target directory. @@ -3090,12 +3105,13 @@ xfs_rename( xfs_trans_log_inode(tp, target_dp, XFS_ILOG_CORE); error = xfs_finish_rename(tp); - if (wip) - xfs_irele(wip); - return error; + + goto out_unlock; out_trans_cancel: xfs_trans_cancel(tp); +out_unlock: + xfs_iunlock_after_rename(inodes, num_inodes); out_release_wip: if (wip) xfs_irele(wip); From patchwork Mon Nov 7 09:01:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allison Henderson X-Patchwork-Id: 13034126 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F1540C43217 for ; Mon, 7 Nov 2022 09:03:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230470AbiKGJDD (ORCPT ); Mon, 7 Nov 2022 04:03:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33536 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231158AbiKGJDC (ORCPT ); Mon, 7 Nov 2022 04:03:02 -0500 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E25E12AFA for ; Mon, 7 Nov 2022 01:03:01 -0800 (PST) Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 2A77gl5O017547 for ; Mon, 7 Nov 2022 09:03:00 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=45ArkmVQ5fgylHr1YnqCqKpINy3ZxnT1bq3Y1/bLqvM=; b=ZO71W8g4oKAv5X+9htv5NQUhQgzrnWl+FxAuiRF6wZrMckW0dTRh9r6FsrxJbq57+KUk fcvMI7suaISZwsXixPkjlGQ6fkrcyOi5SkN9OGG3UqmN3Z7G7u72UBu68m7zviBDTMPH KQfvVN5Fcbsoq0FdFyTvIcUPzsrlC9EauYecqu1t7tMQsGRMTHf/cdIkQy4m/3Fjcxfh VmH8ubWEjM9MTH3ssmQe8GYKoqquq/I8DXP2V2j1ICCKPofdk0KMX8fEWJr55Qm9oyMT htzWaMk4e8+5VRVoadtf6k4xts+Rshoon2YzADXng2wzDkk5zYHFNHIpGZtvU+J6sdvX 1w== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3kngnuu33f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:00 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2A77011u014538 for ; Mon, 7 Nov 2022 09:02:59 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1anam02lp2040.outbound.protection.outlook.com [104.47.57.40]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3kpctatksy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:02:59 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FI1hCwIuZ8w2peWiWOdgKf/S3qTnkpIDzNV+wZDxziY7GogbJddo4RDcDTqmIxukCoA8Iw6C8bYtuSLyknYWaaxj0MQMlzJDdZsA3AijgC9OsDThxb19bC8+ax5mwtjcL9+Y8P/PDjuChoJ4/NJQ/lSzo7E+iNs9qKMbZsEg+uTkOIv+jH9pU7tNTGJOegBhlsMNUtF47mG4HMJ3AU0Hq44aQGNGKiR1oEWvkTE5X9H7+qqLpOj9l/d6kNZTAJJsYqGhLGOdZgbFzYQexTF1SC/lI6aHM8rF9Jw7GMF7VPGcT9slJ+gTwMP/SbqPhNuoc8Ag1znPDPk8qve9Orb2kQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=45ArkmVQ5fgylHr1YnqCqKpINy3ZxnT1bq3Y1/bLqvM=; b=TY2qOg0/D9WFLtTVjCjjKEO1QXdlmKMXJEGkAAzYRuJjuoTnzjEG5gslcDn+b+eDr/FoBBjlMO4g9t0b6535Aodcl9EnFNRGLbQF6CMrfL9Fvn/jV+KE46gtlXWVQDwT8Y1fLxWxvoa6xwP5pdVe+U+3DfJ30zT5GoIRYSg9a2ggQtlCitLsoGwDPE20ZzzcSXMUV1H7fCpVQS5nqDdetRxKCfF52r9BXToF+hk0bOQrGxPU0n76qReU9E53/0CnfU/XhGAfmSw0WQcLCpm3vwELSi/O25TAuQCs8K5DNSmnpNRlJOgporE7CMfDvS0OYSywYlF5td40V8jpGFDblQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=45ArkmVQ5fgylHr1YnqCqKpINy3ZxnT1bq3Y1/bLqvM=; b=XMUHH8D00dotsjxmTEqC993oTXQxDfZVdT3tqnoThUTlJ6tso2jWcvR1HU04H3AliI/i2IMf/OTPJ/DncV+RWHDV5e3LG7sg0Vav+IcEn+Bdb+5LhGjLpmIz34W2cVgvneJmEPCH/SSq9tjleEd1rWV49YynB5pRE3LG7rkERGw= Received: from BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) by PH0PR10MB5848.namprd10.prod.outlook.com (2603:10b6:510:149::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Mon, 7 Nov 2022 09:02:57 +0000 Received: from BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3]) by BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3%4]) with mapi id 15.20.5791.026; Mon, 7 Nov 2022 09:02:57 +0000 From: allison.henderson@oracle.com To: linux-xfs@vger.kernel.org Subject: [PATCH v5 06/26] xfs: Expose init_xattrs in xfs_create_tmpfile Date: Mon, 7 Nov 2022 02:01:36 -0700 Message-Id: <20221107090156.299319-7-allison.henderson@oracle.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221107090156.299319-1-allison.henderson@oracle.com> References: <20221107090156.299319-1-allison.henderson@oracle.com> X-ClientProxiedBy: BY5PR03CA0008.namprd03.prod.outlook.com (2603:10b6:a03:1e0::18) To BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB4306:EE_|PH0PR10MB5848:EE_ X-MS-Office365-Filtering-Correlation-Id: 577378d2-e659-4fd2-0a88-08dac09edd57 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8VymHs9Xa1CwLas11GgCzyjaL0QDY7q5vXzZsE8OuVeX0Rd8C5SZSxvIuOXMWVuiugnQ0pelBzNVE4izisg2DewnQrpyzVdNTYxSrDhyScwvvb1SVlniSdvzQOUrcJUMvpybweMZPiehnKmFXCCv+wEm0WMcXAwlUnwUdeRxPk7b95gPn0EEbp9I14vzZ1ifUI/bEabf4JybMNBJgE1vHCkdCTjn+nhvtxHKg6DoTorwc7J9v8SoJqDRVXbFIm2yQ9sdRsFULbsDoSLdiyrlnqPHy505MSokLRG9rkkipm0krw978ONCIU6D0iYA++65OZ/2Kgic6UJJTOx+wXks1kDrE1PRr+J10VW4TdYA6PshPQf6MNbdSGQZvjo74g6laB7YWA7w3mVPC8CzRCSjQmIgukmXRjr7gutfCcSlQRri+Gc/5FIfC9R8DZr1vR2jZ6LTYKnRXHWklZTuQDcNh/WLenMLXk8ffOji4DGq73jVmkGThMzvSu2Nt1rdHEgma3y1dIziWkyq7lUTgZNPS2jphXIaNqUOqWoo5HgMlYTGnXYFCrleb9PI1xMJEWYYBBM61NDtxi4/i5ucAURQuIuM9HujLU/jmB9jRO7/b0wdipCXe7yUhR9aq3bd/34XzPd9wCXOmMVqXaKCm9k2QT9XOzaIdGPT1iFWZKN3v73w3AGkVoD02zIYsEUGWzy+PJfc2pOrsr/U549CAKZmPw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB4306.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(396003)(39860400002)(136003)(346002)(366004)(376002)(451199015)(36756003)(8676002)(66946007)(6916009)(66556008)(66476007)(83380400001)(2906002)(6486002)(41300700001)(5660300002)(8936002)(478600001)(6512007)(2616005)(186003)(1076003)(26005)(316002)(38100700002)(6666004)(86362001)(9686003)(6506007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GHZ2oDbV1cljbZOD7afJP2j/vowRpL6Yqf8mmCYTlgrMvqzHH0fOnRn7YcGBBtsG2iJcFhjChi9UexkVG4EbLavxukEeMSy3ttxQav10iCZkXYaJ/sjdgnzGjKcSYxdXzjYnqEAu9wWk5V1M2lMbo8SxAsPe1rmL+ecpynW4y70JOmnFPKegUZT2sWK85+kI0xlQAgGLoo8qzSv6wlzpAFhdJndTHA6Jgx13aBKPDgIo7Cpo7jGMmd6XNmrnYHTo4X/vUdkz9Vp8bVf7g65nsXT8zef6ntvEtiRmqJhLd2kshf2BCVa+p5/s4avqpWL25SXZZ/yXty0sP3iJEP/K34TE/Gb7IQG56eIFK9pNvWW6g/Fz//W/+/TRf+4EkTD1UFVIS21pSWJ8IgrT0Q9RTveyVoYTP889Mqm3M8dYuX5C4p7c/5TuRpmh7lqPZHERobXNwMQ9ogXnSgBTCi961MGXGmff638fvTNpGFyJyd3xBnY/EZSk3DYyb5c9KIrUApc0gqu1m+6ZjzJ2fmWJOkdGkzn2uMw26HDvPD8Yvno/CNptttVZjDWSx22EGx+/kNU5rM2PGQAXga4PJdEx5w72Q/cP2kjgHvSYkQcTO+3QKZ4kw6y8KT8Gdb1Rq+fO7J9/X7FtwJgviTShgQ76YLFtm9d6l1XyZ5kom5KuO2ZxrIMWOxjCM0UJqpfthNiIE7TjK3VQSfuL6LDAFqr3NHx18JiWeOzZStm7ZUAnkrJEauezQZVK1Yj4QibIPk6JwWXaRbTpOaurVc1S6HVdp3R5pHxUOgXpyod1oJCr7JKbIL7SYSvmMHgLkRtm/Nwbd52YmM3w3FnRPDbaERa/9Zupw/DsKut9A6+hprEH7vEvv3QH6Y0dFomAripvulz60PCMrU8+mEYK0vzA7EFaTopGOU22i0Ps1BAjtSvhYCFZxSX8qB4LrZkwDNWV7fpv6KiG6l2E/d2z8Ala8tlth5rEjieO5+33IF5Scx4rpjdkcwmdrcP7+68nYxZSZY/I5hzkTwCHGJdEySSd6oy20SFIlMJRkgYhdfQprfu6hWLn9TxAdgoTECOC3HvDnDxn/sfyvmX8/flioiaSNmo65/bwRl0nltLRDGvX5y4LNMoasvp7xpSuD0mhCKno7J54NnPEnnuUNCds4uC/Y+mhqYIJQI1OuL5TeMHKQrC+uVLEe15M+td6m7FUigFv1LxTyvJlH49Lse0nlODLP8Mw7k/8t/vmJ6V7TjOrbOF/wC4UO6ZDTsJw3ZjP60c/IkqBk/3jPcJ4+UEBp9mYT4sEfm0GxCBTqGGHC6KRNEBMXAfzu959fCTHWBTqdpqHYkQFIwfwKlJOIycZWl2VniMH8HdESylvG3M1t+jraAX7qn5g7nw412r1QUJ8GZEgPPMbfNpcJyYPk/EaJpdTVkyP9TtTOU5osf2TDmJXYrJZLiahyEDaKldHd2ptg1qM9woLaqdfPfUVczxsn52ZTETdyTdJGhIjnpb02yXNxoaFrkIppb4TWG8Ivxi4RzH1dRJnHsYbGiCcALfTC/1ZLTWmLsASHJP/SWCrvsVCt677ylSrVgDIsy9CHlo65fhii0uBFTjaVgoVRjuzve9IpjT0qA== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 577378d2-e659-4fd2-0a88-08dac09edd57 X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4306.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2022 09:02:57.7650 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: aQNnzHXCNf5QhVkD6EI2f77L1stIYjSMD0b61T3LDXSqA+P9Lb6/pEbvryXzCSG3ZDgLTa+CuwMDN5u8JE/XwCaK8M/rlfspDCQaa7vdT5I= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5848 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-07_02,2022-11-03_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxscore=0 spamscore=0 bulkscore=0 suspectscore=0 adultscore=0 malwarescore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2211070076 X-Proofpoint-GUID: MAsMf_yD_kuYXu4yuhGBcBWgJbN0xzNt X-Proofpoint-ORIG-GUID: MAsMf_yD_kuYXu4yuhGBcBWgJbN0xzNt Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Allison Henderson Tmp files are used as part of rename operations and will need attr forks initialized for parent pointers. Expose the init_xattrs parameter to the calling function to initialize the fork. Signed-off-by: Allison Henderson Reviewed-by: Darrick J. Wong --- fs/xfs/xfs_inode.c | 5 +++-- fs/xfs/xfs_inode.h | 2 +- fs/xfs/xfs_iops.c | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 7c91a4507a65..7eb65bccd8e4 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -1108,6 +1108,7 @@ xfs_create_tmpfile( struct user_namespace *mnt_userns, struct xfs_inode *dp, umode_t mode, + bool init_xattrs, struct xfs_inode **ipp) { struct xfs_mount *mp = dp->i_mount; @@ -1148,7 +1149,7 @@ xfs_create_tmpfile( error = xfs_dialloc(&tp, dp->i_ino, mode, &ino); if (!error) error = xfs_init_new_inode(mnt_userns, tp, dp, ino, mode, - 0, 0, prid, false, &ip); + 0, 0, prid, init_xattrs, &ip); if (error) goto out_trans_cancel; @@ -2748,7 +2749,7 @@ xfs_rename_alloc_whiteout( int error; error = xfs_create_tmpfile(mnt_userns, dp, S_IFCHR | WHITEOUT_MODE, - &tmpfile); + false, &tmpfile); if (error) return error; diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h index 2eaed98af814..5735de32beeb 100644 --- a/fs/xfs/xfs_inode.h +++ b/fs/xfs/xfs_inode.h @@ -478,7 +478,7 @@ int xfs_create(struct user_namespace *mnt_userns, umode_t mode, dev_t rdev, bool need_xattr, struct xfs_inode **ipp); int xfs_create_tmpfile(struct user_namespace *mnt_userns, - struct xfs_inode *dp, umode_t mode, + struct xfs_inode *dp, umode_t mode, bool init_xattrs, struct xfs_inode **ipp); int xfs_remove(struct xfs_inode *dp, struct xfs_name *name, struct xfs_inode *ip); diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c index 2e10e1c66ad6..10a5e85f2a70 100644 --- a/fs/xfs/xfs_iops.c +++ b/fs/xfs/xfs_iops.c @@ -200,7 +200,8 @@ xfs_generic_create( xfs_create_need_xattr(dir, default_acl, acl), &ip); } else { - error = xfs_create_tmpfile(mnt_userns, XFS_I(dir), mode, &ip); + error = xfs_create_tmpfile(mnt_userns, XFS_I(dir), mode, false, + &ip); } if (unlikely(error)) goto out_free_acl; From patchwork Mon Nov 7 09:01:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allison Henderson X-Patchwork-Id: 13034127 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 07824C4332F for ; Mon, 7 Nov 2022 09:03:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231158AbiKGJDE (ORCPT ); Mon, 7 Nov 2022 04:03:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33536 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230516AbiKGJDD (ORCPT ); Mon, 7 Nov 2022 04:03:03 -0500 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 853E115FC0 for ; Mon, 7 Nov 2022 01:03:02 -0800 (PST) Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 2A77ixDf023182 for ; Mon, 7 Nov 2022 09:03:01 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=e93XNYlgfX+2efxQ4Khye86kHaN9bj5/x561YMwv7y8=; b=MsR/kfi472xlXTWClOJdkk+6OEXqn+7VYOCuMVXHvIrWvlrf9y9lTCqb0sHLw0e12hSN JyE6+cO1LiyEXT58VEWuA0XEz4lvR80QTh1yca1TMtKDJShjOoVXgnbpWVHj4ROEQt0+ zcPBt7AcjayS3+1wWZ9UUq8gIgx8UljbP5NiS4P50khyKrC+hsz902XX6wXl5xx3cibU Kg5w3f/OdemG4N7pITu7+GfEqRx4rNCe4zmJIjbOxPAskkt22nUfJFwwq6cOsEWKaz3H lsX30lNp4omX9utN31HbDIgFAQJ+7vDvT21zu4eqKh/mNBkGWEntEgGCtbSbCoA/Vuas rg== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3kngkw3398-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:01 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2A77CvTv001595 for ; Mon, 7 Nov 2022 09:03:00 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1anam02lp2048.outbound.protection.outlook.com [104.47.57.48]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3kpcq0jkv9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:00 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oddQPuArvyBJ1x3Xcoj/fRG2FMYTNVwgI6vcPwau/IAE2wxOirkdskGS88tGk3RfRg0o1p1DpiAbv5Wdw14Bvm8qFFGsAVZdKXuo4/WynaFxWKIEgk86ZwSSb9w00tvHqPOAfMwy62YahyXj/nc4G5/a00J79apaFmEMLFPIa/7RB9VJFCehMNaMc+XJbF2XH0RS/YdDhn1YYDDjw3Rm0vbrLq+tLLvESspexKhsWmhl/r9/RkShwLHWTp8fpmNUUmG0q2GSDSeB/FgsIf+1Id49aAxS9/vcWVgiAptHhaYKjjy9hDSmDu9vpJOLJ2uZrSExMNUKwUJIQTmztJcbEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=e93XNYlgfX+2efxQ4Khye86kHaN9bj5/x561YMwv7y8=; b=F/RrsP+w9ERxp3X9zKnf2EXA5dw0lXbC4vpU6/l7SpBq6S7TRYNl603C5qLjDaqsDg0FAJ74/jhLLS5JieVx2RbpjUKrT9RdJh3Ngxclpr9EF9AYYcJmeHvi3JHk0/oaI6xa6h5pTHvB4X48ouNP8pFduCs44ub6fRQpz7ccrqEHT1Q9IrIKspsvNkLhzs6jBYr9IInshEMyByAsAj9maEWBZWLccPvqQU1OCBFYWTCXALv585BvhAtq2RNH1X3JEaddwL9g6KdK5c5Wr5wwa0dGdLNFXlGgiDHlQQ5msUO5zk/YjFzknQ6DJ9jDEudbSGBEx2uP6Mw2H47wq7JLLQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=e93XNYlgfX+2efxQ4Khye86kHaN9bj5/x561YMwv7y8=; b=Q+t6j3hGwJoy1aXvLK2GtlpRy2qkGg+9bInVqESLd88VjxCoilOcdoGvahfZoCmE2NqraH1h1ZYIEd7rCG9mOnuiB1/PQUGK9qx2ILwhGm7iqWPm0UEcqcOzdw+5n7ZKKgvNGUKV+Zeqywh+RRjWVTyr5kw776DursgtGFa6Z8s= Received: from BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) by PH0PR10MB5848.namprd10.prod.outlook.com (2603:10b6:510:149::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Mon, 7 Nov 2022 09:02:59 +0000 Received: from BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3]) by BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3%4]) with mapi id 15.20.5791.026; Mon, 7 Nov 2022 09:02:58 +0000 From: allison.henderson@oracle.com To: linux-xfs@vger.kernel.org Subject: [PATCH v5 07/26] xfs: get directory offset when adding directory name Date: Mon, 7 Nov 2022 02:01:37 -0700 Message-Id: <20221107090156.299319-8-allison.henderson@oracle.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221107090156.299319-1-allison.henderson@oracle.com> References: <20221107090156.299319-1-allison.henderson@oracle.com> X-ClientProxiedBy: BY3PR05CA0034.namprd05.prod.outlook.com (2603:10b6:a03:39b::9) To BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB4306:EE_|PH0PR10MB5848:EE_ X-MS-Office365-Filtering-Correlation-Id: 644c7c35-231f-4674-8eca-08dac09eddfd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MrBp9TJ3bYbe9pT6Viok4zLAPsfgHggr+Rm4HzQwplscjKrMSAxOpZ5cW5kg97Tw2UpMmDidIVrft+MUNNvfLTpy7tOb/ueJhyFxFPnImYL2GUD9/olWe1lBUCB9k5e5nRJ/aSD8/AU6bMlA7P/++lqfaTKNpMcMe/DUp/BISBawhmsDlQSxCb6Sk6h5ClOnGpkEPQrjG+P7ZQuiKBWRCEfBAeD8bIZ2uYbVVYWHzNoaD1o+/lUImWpqaHFMZr4sciHWRXzITVtOLzQDMlVroUlFsiTRkvwOq63dQ+6Rwtwdg2XXvNRg12a9HqQxW1N2cNUtpa0S9gBAUYRWoaNdCvq5gcC38Gt5g8eaCIk806HWOxjTJZTk+n+LRimxFGDieHE9Cf7O81nWBPspOVTheopC1u7iRt64EXJVMFn+dLCrWZUavT/dnacFS1lIatdGwkMpEbAHVrE1Ls7ZxhELGKPIJH+I6BWx4aCdWOxJ/WAZvTctsuhu2hq1GYcCARXwDPoykKH0Fdl+tjbT+w2TGfS3/AvId5UJf46YgFx+bZOZY3X021e3cuP5pb5fqUUd5HFSjzlV+xGbZCqJ2kKa8k1tri6m5L+M6rGqzEmHdbIp46uEpqGdBLceMENdZnzmtSrgzR0sCoJnaIVBxSs2ilrmbKSP2nuIl7gKQXCxZOhvohuJtuBV9hJsvTg2FjxLkXVN8hAAukKTF45qrmt9zA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB4306.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(396003)(39860400002)(136003)(346002)(366004)(376002)(451199015)(36756003)(8676002)(66946007)(6916009)(66556008)(66476007)(83380400001)(2906002)(6486002)(41300700001)(5660300002)(8936002)(478600001)(6512007)(2616005)(186003)(1076003)(26005)(316002)(38100700002)(6666004)(86362001)(9686003)(6506007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MKSeltDo63MGj4Ptydzc3wLRJ5qWkTwrtv/oizK+SnUcGEDqx5UMIpO7fWYy+AluaSMawHINARVkeH4ryTx/CaBZZ5WKIsJZpRTaKypNBaTu1CvYAPmUd2RUS2BfKxZKMpujvsfGwBBGR2GgxqYtuCMd8dkeUygq3XL/3BmDf/F3taQXOyPpoTS6rbxW3W5j3VL8NC/re5sa6Cbh3PklKYYsoLl/7Pcuh7swDOvfMz4AJmugnVpLYMqNHX5Ys5GY34ZShy6eVNcKcHsAoU6CUFCNlIJ8cZZrQgU6CNRHjja9KkVEy/itw+riZXHnSqmMhKUg5OS6qfKysqoAUunx431sK9TUgEFTp/zawslE5DMrUHy+JVKiJPkdipwtSOJw2s1x0Mtz6Jx9Nn+vVXqzICduZ/Q9oci3IZHUKX3jIMdlSs3FsBJkOI9b8LbmNRwL0z55Zuc/trNoc74Ah5NSjOaE6MJpWTKscT7a9Wn+MAJKu6Q0JF4M4DP7aUw5MseHDShU5JHZWDCCbueLEQDJgungL1g0Gm4IF5uzexUUg5aCiaKL96yu31NbWyeMTSji2DhLySFey6RVeRs+0UhJO/Z/uwPACR4qg6fI065VMKo1Sxfkh7vW0gWXrDIrNwpcACqxPFgeHtePER8L3IFxDLVZO6VW5k0SWqWba05QsgkBG96gofn5sEupWsdOlf0/AO9w0p3WqcNHrqEDbb2hDxT1FezhtRHxgqOxQ37vKO/rKKLJfd3Y4yUaHljtV8qhwQxBeX9TU2sX3ALXE508FhjT04imu+TWFGdOgqgFLiMF3hrJ+ysZrOYJPiDNuH+UZC+9g0afypRAm7KtymxkFhjLgQZboItff+gZV5fmFj+lV3zCgl9dQcrk/l3o1XRxHdoTw/XLdZuWqdMXB60n8yJ5m8/U1SpARYUT0yFog2yOEYXvzfthGHbEzU4gdyb30kGmUTBSF6CIzEeAXRI2NBK2v1Eb4dKayGKS0mUGK7pHAE0zINDrqrlCebjRTTAsARDdS7WhJWycs9NIn+RoZ1jgy7C3xR7uUrQPFvEPyOppY6sKNQROCAYIHTuh6agQN1VFZ10uhz9V5YfpU0XiD+FeRjZt2Lcgk5Z6MSU06MmCUABNYzyCOXTlRQ9jsVVYlvagwTj6jwxRd3wonNivz5pggF9MXyYMif9r76+iWZBNRKr5jOFeTzSfBbQ8KvXotV9QmpCl9arsBIx9VWISx9WGtblnquzH0/EWh+OEkAhwuLy6vEJb2TbMkf4RiZOyIJGuCdALUH4+g4u7ghC7IhKeGfNe9SI+PecRLZvAsE5xdlj0j04SIS4zsYEYdk302VS5iFupRea16JXF82Ro0DJ9qgHyR34Dp5vahb1kHzbaaV4fkrS1c9J8HkH6iTTwAUAKYEj9J8YGGrYp/nuKUKa1UWXXdTZ7AQsbxfBKzNjUSCMhPTs/+dfbdj/8MQ8RV0o8LEsFMGCN2jHUoG4hUmO9WlzzdSkAGAOcJ+z+mLBhNkrSDI1svO10+2GApdvUhD0UbB+SWlgJN2bsfEnUDmaCGJr+9SMaUEP2j7iOHJBD+NSnbvTahECd8zpYagtmnNzKUknRTDFnAZlKwYBLCA== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 644c7c35-231f-4674-8eca-08dac09eddfd X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4306.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2022 09:02:58.8875 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: QCU71K2VeqUPJMC6ulJnRIHFL71OLiRU6i8eLbSBsMqGD62aJXQ6AjKddyB4E9zi1mpxdS9Fi/SKSYmesj7EfwOQ51T+xwSbXnP2XmQhywU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5848 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-07_02,2022-11-03_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 spamscore=0 adultscore=0 malwarescore=0 mlxlogscore=999 mlxscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2211070076 X-Proofpoint-GUID: kPMpxwdcIxeu5h2-lJXkGyup34u7WpPi X-Proofpoint-ORIG-GUID: kPMpxwdcIxeu5h2-lJXkGyup34u7WpPi Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Allison Henderson Return the directory offset information when adding an entry to the directory. This offset will be used as the parent pointer offset in xfs_create, xfs_symlink, xfs_link and xfs_rename. Signed-off-by: Dave Chinner Signed-off-by: Allison Henderson Reviewed-by: Darrick J. Wong Reviewed-by: Catherine Hoang --- fs/xfs/libxfs/xfs_da_btree.h | 1 + fs/xfs/libxfs/xfs_dir2.c | 9 +++++++-- fs/xfs/libxfs/xfs_dir2.h | 2 +- fs/xfs/libxfs/xfs_dir2_block.c | 1 + fs/xfs/libxfs/xfs_dir2_leaf.c | 2 ++ fs/xfs/libxfs/xfs_dir2_node.c | 2 ++ fs/xfs/libxfs/xfs_dir2_sf.c | 2 ++ fs/xfs/xfs_inode.c | 6 +++--- fs/xfs/xfs_symlink.c | 3 ++- 9 files changed, 21 insertions(+), 7 deletions(-) diff --git a/fs/xfs/libxfs/xfs_da_btree.h b/fs/xfs/libxfs/xfs_da_btree.h index a4b29827603f..90b86d00258f 100644 --- a/fs/xfs/libxfs/xfs_da_btree.h +++ b/fs/xfs/libxfs/xfs_da_btree.h @@ -81,6 +81,7 @@ typedef struct xfs_da_args { int rmtvaluelen2; /* remote attr value length in bytes */ uint32_t op_flags; /* operation flags */ enum xfs_dacmp cmpresult; /* name compare result for lookups */ + xfs_dir2_dataptr_t offset; /* OUT: offset in directory */ } xfs_da_args_t; /* diff --git a/fs/xfs/libxfs/xfs_dir2.c b/fs/xfs/libxfs/xfs_dir2.c index 92bac3373f1f..69a6561c22cc 100644 --- a/fs/xfs/libxfs/xfs_dir2.c +++ b/fs/xfs/libxfs/xfs_dir2.c @@ -257,7 +257,8 @@ xfs_dir_createname( struct xfs_inode *dp, const struct xfs_name *name, xfs_ino_t inum, /* new entry inode number */ - xfs_extlen_t total) /* bmap's total block count */ + xfs_extlen_t total, /* bmap's total block count */ + xfs_dir2_dataptr_t *offset) /* OUT entry's dir offset */ { struct xfs_da_args *args; int rval; @@ -312,6 +313,10 @@ xfs_dir_createname( rval = xfs_dir2_node_addname(args); out_free: + /* return the location that this entry was place in the parent inode */ + if (offset) + *offset = args->offset; + kmem_free(args); return rval; } @@ -550,7 +555,7 @@ xfs_dir_canenter( xfs_inode_t *dp, struct xfs_name *name) /* name of entry to add */ { - return xfs_dir_createname(tp, dp, name, 0, 0); + return xfs_dir_createname(tp, dp, name, 0, 0, NULL); } /* diff --git a/fs/xfs/libxfs/xfs_dir2.h b/fs/xfs/libxfs/xfs_dir2.h index dd39f17dd9a9..d96954478696 100644 --- a/fs/xfs/libxfs/xfs_dir2.h +++ b/fs/xfs/libxfs/xfs_dir2.h @@ -40,7 +40,7 @@ extern int xfs_dir_init(struct xfs_trans *tp, struct xfs_inode *dp, struct xfs_inode *pdp); extern int xfs_dir_createname(struct xfs_trans *tp, struct xfs_inode *dp, const struct xfs_name *name, xfs_ino_t inum, - xfs_extlen_t tot); + xfs_extlen_t tot, xfs_dir2_dataptr_t *offset); extern int xfs_dir_lookup(struct xfs_trans *tp, struct xfs_inode *dp, const struct xfs_name *name, xfs_ino_t *inum, struct xfs_name *ci_name); diff --git a/fs/xfs/libxfs/xfs_dir2_block.c b/fs/xfs/libxfs/xfs_dir2_block.c index 00f960a703b2..70aeab9d2a12 100644 --- a/fs/xfs/libxfs/xfs_dir2_block.c +++ b/fs/xfs/libxfs/xfs_dir2_block.c @@ -573,6 +573,7 @@ xfs_dir2_block_addname( xfs_dir2_data_put_ftype(dp->i_mount, dep, args->filetype); tagp = xfs_dir2_data_entry_tag_p(dp->i_mount, dep); *tagp = cpu_to_be16((char *)dep - (char *)hdr); + args->offset = xfs_dir2_byte_to_dataptr((char *)dep - (char *)hdr); /* * Clean up the bestfree array and log the header, tail, and entry. */ diff --git a/fs/xfs/libxfs/xfs_dir2_leaf.c b/fs/xfs/libxfs/xfs_dir2_leaf.c index cb9e950a911d..9ab520b66547 100644 --- a/fs/xfs/libxfs/xfs_dir2_leaf.c +++ b/fs/xfs/libxfs/xfs_dir2_leaf.c @@ -870,6 +870,8 @@ xfs_dir2_leaf_addname( xfs_dir2_data_put_ftype(dp->i_mount, dep, args->filetype); tagp = xfs_dir2_data_entry_tag_p(dp->i_mount, dep); *tagp = cpu_to_be16((char *)dep - (char *)hdr); + args->offset = xfs_dir2_db_off_to_dataptr(args->geo, use_block, + (char *)dep - (char *)hdr); /* * Need to scan fix up the bestfree table. */ diff --git a/fs/xfs/libxfs/xfs_dir2_node.c b/fs/xfs/libxfs/xfs_dir2_node.c index 7a03aeb9f4c9..5a9513c036b8 100644 --- a/fs/xfs/libxfs/xfs_dir2_node.c +++ b/fs/xfs/libxfs/xfs_dir2_node.c @@ -1974,6 +1974,8 @@ xfs_dir2_node_addname_int( xfs_dir2_data_put_ftype(dp->i_mount, dep, args->filetype); tagp = xfs_dir2_data_entry_tag_p(dp->i_mount, dep); *tagp = cpu_to_be16((char *)dep - (char *)hdr); + args->offset = xfs_dir2_db_off_to_dataptr(args->geo, dbno, + (char *)dep - (char *)hdr); xfs_dir2_data_log_entry(args, dbp, dep); /* Rescan the freespace and log the data block if needed. */ diff --git a/fs/xfs/libxfs/xfs_dir2_sf.c b/fs/xfs/libxfs/xfs_dir2_sf.c index 8cd37e6e9d38..44bc4ba3da8a 100644 --- a/fs/xfs/libxfs/xfs_dir2_sf.c +++ b/fs/xfs/libxfs/xfs_dir2_sf.c @@ -485,6 +485,7 @@ xfs_dir2_sf_addname_easy( memcpy(sfep->name, args->name, sfep->namelen); xfs_dir2_sf_put_ino(mp, sfp, sfep, args->inumber); xfs_dir2_sf_put_ftype(mp, sfep, args->filetype); + args->offset = xfs_dir2_byte_to_dataptr(offset); /* * Update the header and inode. @@ -575,6 +576,7 @@ xfs_dir2_sf_addname_hard( memcpy(sfep->name, args->name, sfep->namelen); xfs_dir2_sf_put_ino(mp, sfp, sfep, args->inumber); xfs_dir2_sf_put_ftype(mp, sfep, args->filetype); + args->offset = xfs_dir2_byte_to_dataptr(offset); sfp->count++; if (args->inumber > XFS_DIR2_MAX_SHORT_INUM && !objchange) sfp->i8count++; diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 7eb65bccd8e4..7f8c99695140 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -1038,7 +1038,7 @@ xfs_create( unlock_dp_on_error = false; error = xfs_dir_createname(tp, dp, name, ip->i_ino, - resblks - XFS_IALLOC_SPACE_RES(mp)); + resblks - XFS_IALLOC_SPACE_RES(mp), NULL); if (error) { ASSERT(error != -ENOSPC); goto out_trans_cancel; @@ -1262,7 +1262,7 @@ xfs_link( } error = xfs_dir_createname(tp, tdp, target_name, sip->i_ino, - resblks); + resblks, NULL); if (error) goto error_return; xfs_trans_ichgtime(tp, tdp, XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG); @@ -2998,7 +2998,7 @@ xfs_rename( * to account for the ".." reference from the new entry. */ error = xfs_dir_createname(tp, target_dp, target_name, - src_ip->i_ino, spaceres); + src_ip->i_ino, spaceres, NULL); if (error) goto out_trans_cancel; diff --git a/fs/xfs/xfs_symlink.c b/fs/xfs/xfs_symlink.c index d8e120913036..27a7d7c57015 100644 --- a/fs/xfs/xfs_symlink.c +++ b/fs/xfs/xfs_symlink.c @@ -314,7 +314,8 @@ xfs_symlink( /* * Create the directory entry for the symlink. */ - error = xfs_dir_createname(tp, dp, link_name, ip->i_ino, resblks); + error = xfs_dir_createname(tp, dp, link_name, + ip->i_ino, resblks, NULL); if (error) goto out_trans_cancel; xfs_trans_ichgtime(tp, dp, XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG); From patchwork Mon Nov 7 09:01:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allison Henderson X-Patchwork-Id: 13034128 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5ABDDC43217 for ; Mon, 7 Nov 2022 09:03:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231308AbiKGJDH (ORCPT ); Mon, 7 Nov 2022 04:03:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33536 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230516AbiKGJDF (ORCPT ); Mon, 7 Nov 2022 04:03:05 -0500 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CCC531658C for ; Mon, 7 Nov 2022 01:03:03 -0800 (PST) Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 2A77gxeU017796 for ; Mon, 7 Nov 2022 09:03:03 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=O8ju6B4JkTyF7KNclxpPdxAFjfrgSIkDa8KRlW2zvZg=; b=BVkb3QbfkXOIYyJay7QZMMy4Lk5K7rsJOGa2L518Q3PsBOUfHP2v4qaOg1bQoT/BbcAd vot03F3DoBuEOf9fMduysjdivro7WtnvldpY26efh1vau8i+qV9Q31X6YRiIKMnWdK5D C8gm71RtviEOTWz6t8scfBfHSZp+2LHFNtFyo23Is6+06hC4nGWn2nV1lLzLcjnq9jSc rlTLKhI30ssmm1MjHnEnPhwuEySxl8dGxhXbfq0e+rQ3xbZN8OeTa4OpTadfuxGXq86K ym+Q6E58+HIB8Pq5MJhHsbuEtqfvRbVhyk8310gkYv95oI1MdjFxT4N3ZBKzUSvOTo8y ow== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3kngnuu33p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:02 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2A76oQJd001605 for ; Mon, 7 Nov 2022 09:03:01 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1anam02lp2046.outbound.protection.outlook.com [104.47.57.46]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3kpcq0jkw1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:01 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kLS9u0AskEpF04jH7iT5WhqJYoFMRVrU1RBtoqOHZIGJUOM9sxSlJs97ReGm11PqQBXCPcEouQxvmAdL8VyyERxGMDn1mzXC5YOwuekghkCZkIKib0/uvd/sMEqxuujssAwoZ1k8SDJDUXWvygumRH9kbsJaubsbjpYa3r/mUPUsmK/9FXCbRSYl7u8ijE1NIUXDiLORybg7LHkLH9nHFrxeEI6MJHR59QlPqu8UVllY9+JRTGNKTAP38EEFJwmrkbN/gfGa717+1nXbIeeHNe3GCb/z+ZdtIijL6CKgnp/E7XOnbmb3cYsBQ9UzVnz7DJs4UWD4VyRk9GamG7SpGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=O8ju6B4JkTyF7KNclxpPdxAFjfrgSIkDa8KRlW2zvZg=; b=Yp+j4ifJAVzo7VjS6lmj+ix9lIeQuX4QBJxstNMkA5vdIX1y/QEUST3PcB70012Qklk7ugnc8NXBIGPM3d3AvumrpJ2faczf4OcNJvMfzbAP0NKgaHCLt3RRNnDlcWtwVHv3Cw8CmF+BLME4FnmizOI9l29AcIFurT7RqGyrHtKRdVBNGxu0BY+XszUys625z7lHV0/QHIRsi7elK90C1NOCZ3KrRfZCPCN5IeZ+DKGYqH4tPppfBCh5KnLRhY/buKDr+hhnxcGP9bKwtc/+0qL2st4Eb/IG5xKIWKLtmwo+tzDTrXUeSteDBLfdDG8pfbR8yU3y7861lHlKl/3ltw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=O8ju6B4JkTyF7KNclxpPdxAFjfrgSIkDa8KRlW2zvZg=; b=EJ1clDaN4Z3MC96aLd0ojaJKyI46mAyvUfg8bhyXwvo5qs0pPBiHKImaF9L64CoLJdCsRuYCEkMpXEv2rDUE9G2MKZs3fkGdD7ajHqiGcQeSsYE+V/WPTJRMHTiRx9cqHEDJSW74ClTjF96xfT0zKcfMkndOVIHnrmz/j2ciADE= Received: from BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) by PH0PR10MB5848.namprd10.prod.outlook.com (2603:10b6:510:149::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Mon, 7 Nov 2022 09:02:59 +0000 Received: from BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3]) by BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3%4]) with mapi id 15.20.5791.026; Mon, 7 Nov 2022 09:02:59 +0000 From: allison.henderson@oracle.com To: linux-xfs@vger.kernel.org Subject: [PATCH v5 08/26] xfs: get directory offset when removing directory name Date: Mon, 7 Nov 2022 02:01:38 -0700 Message-Id: <20221107090156.299319-9-allison.henderson@oracle.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221107090156.299319-1-allison.henderson@oracle.com> References: <20221107090156.299319-1-allison.henderson@oracle.com> X-ClientProxiedBy: BY5PR03CA0015.namprd03.prod.outlook.com (2603:10b6:a03:1e0::25) To BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB4306:EE_|PH0PR10MB5848:EE_ X-MS-Office365-Filtering-Correlation-Id: c294f7c2-77fd-4ce7-24ff-08dac09ede8f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /c8TI4+2ObLozkmmiwva5emY4lOrzSMubC4x7z6WvGdOkDILvV4VAssPUZS3DP9aWKHl/o/96aLXXRh6RJRgncSI5prD3yanfw0LSPJvybb2wFTdIkEWgJ44o6s2NM/wklRb+/gOzq7ixsxGUKsCqBL7q49etcZO+R2U6wo566sEzd3/ZUbV0lsef5BB//iF31X8barmQKh8e1kud9vSyiWuiS74DASVraQx1D8bp2lOES93hPCZdkN9MubBgiKHZh8V4TkkCu1LO3/kWChB6lWuJfIUAG/HSpsltwjlIYFd3mQK0nvba9TFMVIRPEb3nTCFTieTkUfR3avsksXq0d52NORgUs7eu5x82yH0d6YMZJm82z+jR8HH507j+3usfB1g0uKf3P7BmtkBsVTtSR/DQgYfS2j21kDhvOOi+PSzWjdz/4sfsRS+zdr9v6OnOuV/Kb357Zfp4/MjuCR2vooPOJzX88x1Tt9LDJ+Td53SWajnx36J9Gs/p2BA+V56BMb4WmI+XhmnNFbZ/jVOnCPxUfAKW237nXkVhFz+Jsyk75hmcJRD6DPlgGVVqzPzK2RFIBUs1haIdkAQJ6yrjr6YCS4CxT/upxJA8Mnd4spMY0r2/yAbspALliL7DlwNHEXXldGl+jZXJAvY7D0kDN7TT+TKi9qRkvSk+Hj8lpxNbu8fIFwigk7PFGzQ0/5xt14LJLVuK/CSAWNsshAynw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB4306.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(396003)(39860400002)(136003)(346002)(366004)(376002)(451199015)(36756003)(8676002)(66946007)(6916009)(66556008)(66476007)(83380400001)(2906002)(6486002)(41300700001)(5660300002)(8936002)(478600001)(6512007)(2616005)(186003)(1076003)(26005)(316002)(38100700002)(6666004)(86362001)(9686003)(6506007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: aweUV7hi5isJLX0OlJnmdcwQQGsolpH9BijmqOwwiietUl5QFh7+b402zsgQXq6cisP59wmsXzHEzWkvC/3MkjpZRsyFHmoXlq9wBHvs4Wc4tC0iOrSemUq9IbP1b8kjhqkFefD04x6BaOSOnAnV46+vlmxDKkS2nyqjcr6nju28XOa0jb+Hl3BrUIXljPI9cgIoWU1Dyi+yzkj9r2OF0OG8HbxvUSnaslYHr/QFpRUoGP38YesKYy/SdbXQh/mC0og0qkFCOITWlToWgbEovthxtQdb2d/YPjTzu1Q/cmJo8t5L4+VeBj9bEjGKHBKm0CPLiKjG/w/EG8SKA0Qtsg0ADdDTqbSj1lfPk7tPXlY8FwMsQ+n70SnDKPm4Ib02sEtcvVzMJEEA1WNwEyzwSNWbG93xJJynCEgMBPYs0/5MvDfgVzPNJXGpOg5CkRmumo2wFIoTOe9ignUnTbdrBtqrgytt19xZTnunP5qt4hIVfOUusMHa2QDQt9v9YJaHwz6su++bKFVc6MpKzqlY4A1g92z9hIfavd1tYdf57tP6Noyo94R/OjcPMXshFDf4C5Tdq7Ey+wGiv/uqNoYYLbCMZJb35Uc8y6fDrojXPy7bA6jNr3usRgcnWDiIJ8+7fGJhYPg+R9ySMilUNN0ngTdBLa+32C9JLz8hOqUW5gl3IDhwiHo6Q9vdwWtQOujJFHARLzjwbM4Kn11+EB2uK98szJ85DVha1sOuvW6b4jtZKbHj/xCrZlGt0TbPbZnlOK1XaPXZATkWxse3AFjfB82SwBmnjU1uZ+60ImPYry1XuHO3dcGMZX6SQEQfNUJ88hSk94/wNIHy/FM7uDo88Oamo5k02eo+44CNy6cDubF/KVpsjfc4ltVwwUEBtnGyHwchQljVHve9BGFsHj/iApUiFrjO3/YpnOIvSS10EkdiL1CFcErMbTWpwQHfF6RbdGpRvw2NFZG3zfiJOBgsiGT1Rrj6xKeYHefpiQCoc+6AYMwaSKCurxO6COqlY3Q9ypQKSEzAL1/erNJp7dEqN1rdlUK05+zx3+cULZd6PGcATSup5FyG9rGxJ8uVDmk2MhtuVzZljSSy0gnnNUp6uNAxi5h2BPTQqqpZo3WPzYH8UDW8ic6O3aO5R4s4HquFdXiZq/Xh8x5auY6e83xYi1WfPF+pxJl1iYrveeynEVDE+AdI9br5WFqg8GKMPYGTvS8SFoPAzuZhBj3u6hCwn/OIAZ13h/gSTTS8ihVqBqxWogCrRUfyFlvNjGFO+m2W5OIuR0LKiKbHQhbnm8UkfOlXDuL38Bg0Dq0mXBt8NZinP0kPbG+fecsMUDnTzZzVw/PX72vHYT4LrhPpTcQnC7ECX0Mc0cTvOAXcOAEZ83E4aMT6VphZ2Xw1Lkvw8yCGTcedQR58OeFdBOs//3V/t7u77CF4DhmjEAUwPWTig9RXQ3M6FgNSs2su7J/67+ctwKQXAetSL1FfpeZsdh3OO/7nLsWueh81NL0Txv9soiXhZa9qqNo763QHvWlMZsaLq3KLQygrut9mFS7Dkq1OTBibmv5t0xQPSWVaqMoCTsRb9LKfTv2v/hXLn/1ORHni+qcp3dlfGjdrwEzOt1cpFQ== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: c294f7c2-77fd-4ce7-24ff-08dac09ede8f X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4306.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2022 09:02:59.8417 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: oYyxnPWFAqZvHH/NsvtvrtltCM4/tB5/JKzYtjFRBRntf56dQrnr2ZL0qV1Ey5U7+u80mGKLh1RPNHAQj5sZUwa89l09XFzYIGXEKTAQsE0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5848 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-07_02,2022-11-03_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 spamscore=0 adultscore=0 malwarescore=0 mlxlogscore=999 mlxscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2211070076 X-Proofpoint-GUID: esOUjgvI8ZJhuln9n_maOgD-0ve236n3 X-Proofpoint-ORIG-GUID: esOUjgvI8ZJhuln9n_maOgD-0ve236n3 Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Allison Henderson Return the directory offset information when removing an entry to the directory. This offset will be used as the parent pointer offset in xfs_remove. Signed-off-by: Mark Tinguely Signed-off-by: Dave Chinner Signed-off-by: Allison Henderson Reviewed-by: Darrick J. Wong Reviewed-by: Catherine Hoang --- fs/xfs/libxfs/xfs_dir2.c | 6 +++++- fs/xfs/libxfs/xfs_dir2.h | 3 ++- fs/xfs/libxfs/xfs_dir2_block.c | 4 ++-- fs/xfs/libxfs/xfs_dir2_leaf.c | 5 +++-- fs/xfs/libxfs/xfs_dir2_node.c | 5 +++-- fs/xfs/libxfs/xfs_dir2_sf.c | 2 ++ fs/xfs/xfs_inode.c | 4 ++-- 7 files changed, 19 insertions(+), 10 deletions(-) diff --git a/fs/xfs/libxfs/xfs_dir2.c b/fs/xfs/libxfs/xfs_dir2.c index 69a6561c22cc..891c1f701f53 100644 --- a/fs/xfs/libxfs/xfs_dir2.c +++ b/fs/xfs/libxfs/xfs_dir2.c @@ -436,7 +436,8 @@ xfs_dir_removename( struct xfs_inode *dp, struct xfs_name *name, xfs_ino_t ino, - xfs_extlen_t total) /* bmap's total block count */ + xfs_extlen_t total, /* bmap's total block count */ + xfs_dir2_dataptr_t *offset) /* OUT: offset in directory */ { struct xfs_da_args *args; int rval; @@ -481,6 +482,9 @@ xfs_dir_removename( else rval = xfs_dir2_node_removename(args); out_free: + if (offset) + *offset = args->offset; + kmem_free(args); return rval; } diff --git a/fs/xfs/libxfs/xfs_dir2.h b/fs/xfs/libxfs/xfs_dir2.h index d96954478696..0c2d7c0af78f 100644 --- a/fs/xfs/libxfs/xfs_dir2.h +++ b/fs/xfs/libxfs/xfs_dir2.h @@ -46,7 +46,8 @@ extern int xfs_dir_lookup(struct xfs_trans *tp, struct xfs_inode *dp, struct xfs_name *ci_name); extern int xfs_dir_removename(struct xfs_trans *tp, struct xfs_inode *dp, struct xfs_name *name, xfs_ino_t ino, - xfs_extlen_t tot); + xfs_extlen_t tot, + xfs_dir2_dataptr_t *offset); extern int xfs_dir_replace(struct xfs_trans *tp, struct xfs_inode *dp, const struct xfs_name *name, xfs_ino_t inum, xfs_extlen_t tot); diff --git a/fs/xfs/libxfs/xfs_dir2_block.c b/fs/xfs/libxfs/xfs_dir2_block.c index 70aeab9d2a12..d36f3f1491da 100644 --- a/fs/xfs/libxfs/xfs_dir2_block.c +++ b/fs/xfs/libxfs/xfs_dir2_block.c @@ -810,9 +810,9 @@ xfs_dir2_block_removename( /* * Point to the data entry using the leaf entry. */ + args->offset = be32_to_cpu(blp[ent].address); dep = (xfs_dir2_data_entry_t *)((char *)hdr + - xfs_dir2_dataptr_to_off(args->geo, - be32_to_cpu(blp[ent].address))); + xfs_dir2_dataptr_to_off(args->geo, args->offset)); /* * Mark the data entry's space free. */ diff --git a/fs/xfs/libxfs/xfs_dir2_leaf.c b/fs/xfs/libxfs/xfs_dir2_leaf.c index 9ab520b66547..b4a066259d97 100644 --- a/fs/xfs/libxfs/xfs_dir2_leaf.c +++ b/fs/xfs/libxfs/xfs_dir2_leaf.c @@ -1386,9 +1386,10 @@ xfs_dir2_leaf_removename( * Point to the leaf entry, use that to point to the data entry. */ lep = &leafhdr.ents[index]; - db = xfs_dir2_dataptr_to_db(geo, be32_to_cpu(lep->address)); + args->offset = be32_to_cpu(lep->address); + db = xfs_dir2_dataptr_to_db(args->geo, args->offset); dep = (xfs_dir2_data_entry_t *)((char *)hdr + - xfs_dir2_dataptr_to_off(geo, be32_to_cpu(lep->address))); + xfs_dir2_dataptr_to_off(args->geo, args->offset)); needscan = needlog = 0; oldbest = be16_to_cpu(bf[0].length); ltp = xfs_dir2_leaf_tail_p(geo, leaf); diff --git a/fs/xfs/libxfs/xfs_dir2_node.c b/fs/xfs/libxfs/xfs_dir2_node.c index 5a9513c036b8..39cbdeafa0f6 100644 --- a/fs/xfs/libxfs/xfs_dir2_node.c +++ b/fs/xfs/libxfs/xfs_dir2_node.c @@ -1296,9 +1296,10 @@ xfs_dir2_leafn_remove( /* * Extract the data block and offset from the entry. */ - db = xfs_dir2_dataptr_to_db(geo, be32_to_cpu(lep->address)); + args->offset = be32_to_cpu(lep->address); + db = xfs_dir2_dataptr_to_db(args->geo, args->offset); ASSERT(dblk->blkno == db); - off = xfs_dir2_dataptr_to_off(geo, be32_to_cpu(lep->address)); + off = xfs_dir2_dataptr_to_off(args->geo, args->offset); ASSERT(dblk->index == off); /* diff --git a/fs/xfs/libxfs/xfs_dir2_sf.c b/fs/xfs/libxfs/xfs_dir2_sf.c index 44bc4ba3da8a..b49578a547b3 100644 --- a/fs/xfs/libxfs/xfs_dir2_sf.c +++ b/fs/xfs/libxfs/xfs_dir2_sf.c @@ -969,6 +969,8 @@ xfs_dir2_sf_removename( XFS_CMP_EXACT) { ASSERT(xfs_dir2_sf_get_ino(mp, sfp, sfep) == args->inumber); + args->offset = xfs_dir2_byte_to_dataptr( + xfs_dir2_sf_get_offset(sfep)); break; } } diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 7f8c99695140..8e4fa5d6096d 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -2506,7 +2506,7 @@ xfs_remove( if (error) goto out_trans_cancel; - error = xfs_dir_removename(tp, dp, name, ip->i_ino, resblks); + error = xfs_dir_removename(tp, dp, name, ip->i_ino, resblks, NULL); if (error) { ASSERT(error != -ENOENT); goto out_trans_cancel; @@ -3095,7 +3095,7 @@ xfs_rename( spaceres); else error = xfs_dir_removename(tp, src_dp, src_name, src_ip->i_ino, - spaceres); + spaceres, NULL); if (error) goto out_trans_cancel; From patchwork Mon Nov 7 09:01:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allison Henderson X-Patchwork-Id: 13034130 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DA9EFC4332F for ; Mon, 7 Nov 2022 09:03:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231295AbiKGJDJ (ORCPT ); Mon, 7 Nov 2022 04:03:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33572 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231346AbiKGJDG (ORCPT ); Mon, 7 Nov 2022 04:03:06 -0500 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C2ED1659D for ; Mon, 7 Nov 2022 01:03:05 -0800 (PST) Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 2A790jkE001570 for ; Mon, 7 Nov 2022 09:03:05 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=o8CWbSEqwj6Umwt7KTTA/bcMkjKpKoHEYzr/HFUvGFg=; b=HTEsmndGmNR49XHvZX4wjfXYaj9xtU7if+9bA2BTCPc6/dj4EKIL0rG6/8BkAbSgJ5N7 sAU/h5QhX5G6x6vlfmJtHMFK44J0A6ChAdVGKs7y7ottfb4Qgwo23yEBtmOV21DK3DHX WkmOmXcFGlFaSR8zifuIVUuGo6WVJuHglGJq7ZNm43emceV0odS+SVsdvoQkf0Ft+ASZ xHImA/6Y9vYWnBSSOBox40R76BNFCwhjCLnF3jLOtj7DH8+j6GX6RgeUuJcm/4vnYNrl 1fROa/ySishpWB409mzfbH17mYQZWjxQRnnUjZVgJ/USdFxgdyinE8EjQlKpx1T7s8pn RQ== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3kngk6b7q8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:04 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2A77fB75025283 for ; Mon, 7 Nov 2022 09:03:03 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1anam02lp2049.outbound.protection.outlook.com [104.47.57.49]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3kpcqek6f5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:03 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FDjgY/XBgbFz1XmgJnl4p38fiSqlkWQd27vkM0RuIHJanE9GPm99Qdpq35h7jciLE7xJq/HoBMgwyaH/RCZiC/PH2DczrCYFIYFBQcHfpehm5GpqrgYCQRck2bbzSM85XZsqxb1Tip9vf2Pz9/YTyn65WrZ4zMshpTOc4q9pk8JAD+HV+9LUCE82WJ2UVJhbSdw3r7V3GY80RB18Y6hK3fwZ3WKnHVwGW0cPCniJTuFwIBueGtEEuCAVx+fbQPQ4UbgmCdnM8C0+5uybrzQjf1d5yoH8mPZFj4HQGIJVoSbDtgTuzkZpZgK/XkHkZz7GDHgQFnFapQ2mtI8u9nwHWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=o8CWbSEqwj6Umwt7KTTA/bcMkjKpKoHEYzr/HFUvGFg=; b=Wkgx8HCUeshmeDAk6A6mNKE3RFXxiRuw3HLYiSUHK0LdZjsv6VROkNfKHRcPr5KKlVaJB9PKbCf6IQs825piAdlaGaBcc67lAHrw9OdHKxfNFYSo9h/TW1m8A05XysNTQirgIFQmJEO6J6PtwHFES9UiJTM8NhrgIOB1uZQEaKjRDQztYui5cvRYnNl9UmDRW/jvcsaYHrxmdLw3iC1rO2wFy3RoWBiOwvTFVAIFDu+F9OhXXiq4GdDMxqh5UkZrQODljfY3LpcFu11sE+4hOh+PfIt+ARYmcDGyCbxGjRWGL9aQJf4/59nfhSnSmfpZ80iXrzzeod/PX93ggh4XEg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=o8CWbSEqwj6Umwt7KTTA/bcMkjKpKoHEYzr/HFUvGFg=; b=aMTYFHcU/W0Dz11P5K0M1iypFq5Aj5L+wQ15FzZQAN2Gz4Q2lRxYZEM6icqFmvJsqBkr9xHMZWCrPlXKkT0xAZtV5k0oAERTFjtZZLCmU0QNzTpfSNqTM0+hEUhcBrG1M2V0NP3pjD09vZ84Gc6RpsfI/Z0PnQyW6Avmxp9Li0M= Received: from BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) by PH0PR10MB5848.namprd10.prod.outlook.com (2603:10b6:510:149::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Mon, 7 Nov 2022 09:03:01 +0000 Received: from BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3]) by BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3%4]) with mapi id 15.20.5791.026; Mon, 7 Nov 2022 09:03:01 +0000 From: allison.henderson@oracle.com To: linux-xfs@vger.kernel.org Subject: [PATCH v5 09/26] xfs: get directory offset when replacing a directory name Date: Mon, 7 Nov 2022 02:01:39 -0700 Message-Id: <20221107090156.299319-10-allison.henderson@oracle.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221107090156.299319-1-allison.henderson@oracle.com> References: <20221107090156.299319-1-allison.henderson@oracle.com> X-ClientProxiedBy: BY5PR03CA0009.namprd03.prod.outlook.com (2603:10b6:a03:1e0::19) To BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB4306:EE_|PH0PR10MB5848:EE_ X-MS-Office365-Filtering-Correlation-Id: ae11d8b3-4d43-4e6d-26fa-08dac09edf74 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yXoI62Cf5TgxrLRqI7LBDRrosJWxap/iFB25FxgRlJvLBolhOzBIDTK8pOJNWf5ef2Dnm34vERhQAQ/gx4TWilP4uMorDcWeC8mKIv2xspLGH4nbx6+dldok29JMl4rZG9tSaAwnTrp/DOrZ5K53aLzyc3xn7KrU5+RhTJsR13Lk4SugVDgC+cve0GrUiNNTeXFdcQ+ClN/vy0T2K4CWyxXeoTJpbozdODfNA+Lb6NQjtI7JNUtQFAccUIBZOvZctkxHSFPZO+HeG0w/jAYVxsggQucyuOayQfLLg4I2cHhguJFet1I5iRnzoy5aZxh9H+Y4RrytSO/Lzex2/Ota4YhBZtKmtmerABELimi9KQZ2THLDfgkXw7vbHDMN5Y7QzSHUSDq26OusGTeLE33vWOPjQHJoKSdUIo4XT3vXsoR5r8rgRaUu9JBZnK2zpdgHoITjiL/Wqak28kVnif4orUhsyiG52IwhtPH4+I7GHQpa11Bd1eLZouCDshbngZF83LtNwp50CwmkALTXo53KUrjUjqUvXg1L8K4zQNAB58K9y4WoD6QJxUcAYy301zRWkv84VLPFUp1/06fnXwMyO2aifXqC5amEZ4HY0oiZTIS3svaSay2Xra2sZtoteCvFzL8WbJWtsOBh96TDjvBTyLuyFKx5VGxgutN5mN6QBe0CtAiKUv5SRlTBy85AY/0d X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB4306.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(396003)(39860400002)(136003)(346002)(366004)(376002)(451199015)(36756003)(8676002)(66946007)(6916009)(66556008)(66476007)(83380400001)(2906002)(6486002)(41300700001)(5660300002)(8936002)(478600001)(6512007)(2616005)(186003)(1076003)(26005)(316002)(38100700002)(6666004)(86362001)(9686003)(6506007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nuXgKVChBl28e9QQJPvyz6YrDSDIRkaceq0YP5dUS8+oEZwnHmaQF082KkvnVXIk1hZPrX+bdmphlzn/LLsDlvqJaJoHGyCZm5UBooZA7gNIn9PsQcLL8aKuNOVfGQqT51rXiMSwhH5oVwKAfk1oVfaDFcO3izr/BGcq28dLoBPwjKVMGzKmVM8VoEzsj0YK3pbe3M3a2Ui8pyQ7d3mqoIonhAHERHa63KDNyfB1Ao+5XTcdrangBLP05y1lWIewWUoP2qZ2aDghj3IAKHfLE2O/fPuJKqXSq5JXTMda0EhRVs+EidtwWq9+QaZmEYvwfA1wHmwObcHsvOnp80nVAYr0IbbyhE/4HNSEU33Gq1yw3AqXSdl1KRV4vUlK/4jXp7xVNKG969eabVf0BQZcXLgnt3SUySU95Kc31/eTxhnF4kuiS4HhgkrqTL8gt6qs6zJnSR88bdDfY7ZT7K5XTzYhavmrbcKT0SL69GPp7IMt6jm8eDAfzD4gAee2ev+3fuT4JLFVO7PQeZ1OLxf8TkmNCc/PRkxocQJlNamgZG0ghuXgAiJyMsmmaPyOmSs2/AZnnX6LHKq/FjMpp6yuMb4DhdUuBpqU/4K8EQGGq5wUnrunD/sElO8VVMLmeNYAtT4O8KRBJE4OetiFeERpTEpUp6VJke6LLaIXnkN6q/3F/4fozHgSrXg9b/AM46/9qhthII0SxbSiyI78zeDqG/sJRxN6uBTnUqQhn0cxJrAED01U8217CAeWJJufi064r4BpqfiN+FudMngqJzGRCpt3g6lvkIDmVy5OPjVdqENhQGrpXasgQcg59MAUq3j2cu1RqPrCM75fMGs2b9My/B7B4XHn164bjqSa+daj1oetD9pqBkDuyIvakAFzuG5I9mPIhLxxGioHIzYSUE9xP/0e8get2LZN8fP1HiS9ZdN71y8qF7yTlEUHfzo/yigEU1lffqA3IMMbTNk0zr1fUzpbTmO+tqv2SmkCNkZglbw3N4TTNLZfjhGVnhMsCRQ2HTtzAMe2LOGSMwQRij/Cr5N7T/MnbVZoxlL2GhE77DJv6Vg0W4GTKV9U8U3131X2KhPrKv9x2jILt+p0thtLDQ6Y97lfAYEmxIwiQAtZA1SzRFATtBrISYayLLTT/ZVCUMEHobJ6fNWi8T5+8dniRfbioOqtL5oLGU23IVAOG6O+Myx3uTyX9J+krkEPfG9BFqblPEQEaeLBVPSdqcTTRTIhIMWYPMoGeOvbqcsl5k7aweIUgBAxaMeI4hLAsfWbVwVrZAuhgXvxmU5/x9LZsZPCnh8rt160i+oyGU8laZnLJedq4t7QCqGU2e6AOJ2ZlsY0L+9sphM74o0GrG2AIm5F4a8PdmOkgKHqHAktjkfo5KidjMdgXaec41hBTRHLQRQ4ktLkWDIqwSjs0KRPqFEu+Ob9rvhajd9EXtgqjqWmVHfoJHonIPyVdIgxnSVDne71BUYP5hr6RVZ8pdMHXw2hJc4uZfoFxT6jEgW2P1lNcLqyRViD0iK0vd3a0QnMFt4aOFAcR70lEMsFKH5mfw1tXCo7OkMYExdfiChqarj55LnXbgnb2uQzdwppRr8dncnNnTlcB29aiu/0q9v7lw== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: ae11d8b3-4d43-4e6d-26fa-08dac09edf74 X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4306.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2022 09:03:01.3424 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: dSdekVbzbdsAh/pwbKlnw5qc6V3xyKtXSB0HkWwTs/BJsEpqKgcuEEV5jHjRr8rO+MxSkUGkFbDyHSt6IXI03I409OORFwMVn54FCH1BfSw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5848 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-07_02,2022-11-03_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=979 adultscore=0 mlxscore=0 suspectscore=0 spamscore=0 malwarescore=0 bulkscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2211070076 X-Proofpoint-ORIG-GUID: 0XFnwXdrxhcUueZ0VlYQFqIcF5bNGd-s X-Proofpoint-GUID: 0XFnwXdrxhcUueZ0VlYQFqIcF5bNGd-s Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Allison Henderson Return the directory offset information when replacing an entry to the directory. This offset will be used as the parent pointer offset in xfs_rename. Signed-off-by: Mark Tinguely Signed-off-by: Dave Chinner Signed-off-by: Allison Henderson Reviewed-by: Darrick J. Wong --- fs/xfs/libxfs/xfs_dir2.c | 8 ++++++-- fs/xfs/libxfs/xfs_dir2.h | 2 +- fs/xfs/libxfs/xfs_dir2_block.c | 4 ++-- fs/xfs/libxfs/xfs_dir2_leaf.c | 1 + fs/xfs/libxfs/xfs_dir2_node.c | 1 + fs/xfs/libxfs/xfs_dir2_sf.c | 2 ++ fs/xfs/xfs_inode.c | 16 ++++++++-------- 7 files changed, 21 insertions(+), 13 deletions(-) diff --git a/fs/xfs/libxfs/xfs_dir2.c b/fs/xfs/libxfs/xfs_dir2.c index 891c1f701f53..c1a9394d7478 100644 --- a/fs/xfs/libxfs/xfs_dir2.c +++ b/fs/xfs/libxfs/xfs_dir2.c @@ -482,7 +482,7 @@ xfs_dir_removename( else rval = xfs_dir2_node_removename(args); out_free: - if (offset) + if (!rval && offset) *offset = args->offset; kmem_free(args); @@ -498,7 +498,8 @@ xfs_dir_replace( struct xfs_inode *dp, const struct xfs_name *name, /* name of entry to replace */ xfs_ino_t inum, /* new inode number */ - xfs_extlen_t total) /* bmap's total block count */ + xfs_extlen_t total, /* bmap's total block count */ + xfs_dir2_dataptr_t *offset) /* OUT: offset in directory */ { struct xfs_da_args *args; int rval; @@ -546,6 +547,9 @@ xfs_dir_replace( else rval = xfs_dir2_node_replace(args); out_free: + if (offset) + *offset = args->offset; + kmem_free(args); return rval; } diff --git a/fs/xfs/libxfs/xfs_dir2.h b/fs/xfs/libxfs/xfs_dir2.h index 0c2d7c0af78f..ff59f009d1fd 100644 --- a/fs/xfs/libxfs/xfs_dir2.h +++ b/fs/xfs/libxfs/xfs_dir2.h @@ -50,7 +50,7 @@ extern int xfs_dir_removename(struct xfs_trans *tp, struct xfs_inode *dp, xfs_dir2_dataptr_t *offset); extern int xfs_dir_replace(struct xfs_trans *tp, struct xfs_inode *dp, const struct xfs_name *name, xfs_ino_t inum, - xfs_extlen_t tot); + xfs_extlen_t tot, xfs_dir2_dataptr_t *offset); extern int xfs_dir_canenter(struct xfs_trans *tp, struct xfs_inode *dp, struct xfs_name *name); diff --git a/fs/xfs/libxfs/xfs_dir2_block.c b/fs/xfs/libxfs/xfs_dir2_block.c index d36f3f1491da..0f3a03e87278 100644 --- a/fs/xfs/libxfs/xfs_dir2_block.c +++ b/fs/xfs/libxfs/xfs_dir2_block.c @@ -885,9 +885,9 @@ xfs_dir2_block_replace( /* * Point to the data entry we need to change. */ + args->offset = be32_to_cpu(blp[ent].address); dep = (xfs_dir2_data_entry_t *)((char *)hdr + - xfs_dir2_dataptr_to_off(args->geo, - be32_to_cpu(blp[ent].address))); + xfs_dir2_dataptr_to_off(args->geo, args->offset)); ASSERT(be64_to_cpu(dep->inumber) != args->inumber); /* * Change the inode number to the new value. diff --git a/fs/xfs/libxfs/xfs_dir2_leaf.c b/fs/xfs/libxfs/xfs_dir2_leaf.c index b4a066259d97..fe75ffadace9 100644 --- a/fs/xfs/libxfs/xfs_dir2_leaf.c +++ b/fs/xfs/libxfs/xfs_dir2_leaf.c @@ -1523,6 +1523,7 @@ xfs_dir2_leaf_replace( /* * Point to the data entry. */ + args->offset = be32_to_cpu(lep->address); dep = (xfs_dir2_data_entry_t *) ((char *)dbp->b_addr + xfs_dir2_dataptr_to_off(args->geo, be32_to_cpu(lep->address))); diff --git a/fs/xfs/libxfs/xfs_dir2_node.c b/fs/xfs/libxfs/xfs_dir2_node.c index 39cbdeafa0f6..53cd0d5d94f7 100644 --- a/fs/xfs/libxfs/xfs_dir2_node.c +++ b/fs/xfs/libxfs/xfs_dir2_node.c @@ -2242,6 +2242,7 @@ xfs_dir2_node_replace( hdr = state->extrablk.bp->b_addr; ASSERT(hdr->magic == cpu_to_be32(XFS_DIR2_DATA_MAGIC) || hdr->magic == cpu_to_be32(XFS_DIR3_DATA_MAGIC)); + args->offset = be32_to_cpu(leafhdr.ents[blk->index].address); dep = (xfs_dir2_data_entry_t *) ((char *)hdr + xfs_dir2_dataptr_to_off(args->geo, diff --git a/fs/xfs/libxfs/xfs_dir2_sf.c b/fs/xfs/libxfs/xfs_dir2_sf.c index b49578a547b3..032c65804610 100644 --- a/fs/xfs/libxfs/xfs_dir2_sf.c +++ b/fs/xfs/libxfs/xfs_dir2_sf.c @@ -1107,6 +1107,8 @@ xfs_dir2_sf_replace( xfs_dir2_sf_put_ino(mp, sfp, sfep, args->inumber); xfs_dir2_sf_put_ftype(mp, sfep, args->filetype); + args->offset = xfs_dir2_byte_to_dataptr( + xfs_dir2_sf_get_offset(sfep)); break; } } diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 8e4fa5d6096d..ea7aeab839c2 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -2487,7 +2487,7 @@ xfs_remove( */ if (dp->i_ino != tp->t_mountp->m_sb.sb_rootino) { error = xfs_dir_replace(tp, ip, &xfs_name_dotdot, - tp->t_mountp->m_sb.sb_rootino, 0); + tp->t_mountp->m_sb.sb_rootino, 0, NULL); if (error) return error; } @@ -2642,12 +2642,12 @@ xfs_cross_rename( int dp2_flags = 0; /* Swap inode number for dirent in first parent */ - error = xfs_dir_replace(tp, dp1, name1, ip2->i_ino, spaceres); + error = xfs_dir_replace(tp, dp1, name1, ip2->i_ino, spaceres, NULL); if (error) goto out_trans_abort; /* Swap inode number for dirent in second parent */ - error = xfs_dir_replace(tp, dp2, name2, ip1->i_ino, spaceres); + error = xfs_dir_replace(tp, dp2, name2, ip1->i_ino, spaceres, NULL); if (error) goto out_trans_abort; @@ -2661,7 +2661,7 @@ xfs_cross_rename( if (S_ISDIR(VFS_I(ip2)->i_mode)) { error = xfs_dir_replace(tp, ip2, &xfs_name_dotdot, - dp1->i_ino, spaceres); + dp1->i_ino, spaceres, NULL); if (error) goto out_trans_abort; @@ -2685,7 +2685,7 @@ xfs_cross_rename( if (S_ISDIR(VFS_I(ip1)->i_mode)) { error = xfs_dir_replace(tp, ip1, &xfs_name_dotdot, - dp2->i_ino, spaceres); + dp2->i_ino, spaceres, NULL); if (error) goto out_trans_abort; @@ -3019,7 +3019,7 @@ xfs_rename( * name at the destination directory, remove it first. */ error = xfs_dir_replace(tp, target_dp, target_name, - src_ip->i_ino, spaceres); + src_ip->i_ino, spaceres, NULL); if (error) goto out_trans_cancel; @@ -3053,7 +3053,7 @@ xfs_rename( * directory. */ error = xfs_dir_replace(tp, src_ip, &xfs_name_dotdot, - target_dp->i_ino, spaceres); + target_dp->i_ino, spaceres, NULL); ASSERT(error != -EEXIST); if (error) goto out_trans_cancel; @@ -3092,7 +3092,7 @@ xfs_rename( */ if (wip) error = xfs_dir_replace(tp, src_dp, src_name, wip->i_ino, - spaceres); + spaceres, NULL); else error = xfs_dir_removename(tp, src_dp, src_name, src_ip->i_ino, spaceres, NULL); From patchwork Mon Nov 7 09:01:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allison Henderson X-Patchwork-Id: 13034129 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50733C433FE for ; Mon, 7 Nov 2022 09:03:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231436AbiKGJDI (ORCPT ); Mon, 7 Nov 2022 04:03:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33536 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231338AbiKGJDG (ORCPT ); Mon, 7 Nov 2022 04:03:06 -0500 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 525D11659E for ; Mon, 7 Nov 2022 01:03:05 -0800 (PST) Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 2A75aXBF015141 for ; Mon, 7 Nov 2022 09:03:04 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=9T0GlrN+YfkG79YJEffUTVVFSrGIFrV+2zA2f1qX1ts=; b=Gag6Map7Z7GY0F3pMh7egwQLr6Pg9DeQ4TN4gdzh3882f338F6VivSufOJOTfAdZPtoQ ZIXVbfkb7i0AOD9BzVnaOjH/nucD1+apFOK3/muMGL2PQyGQ9dA0ZSecWD2wkUe8610t nn0EVhpXLa7L9qTngJV9bqM/SzAYzTcXHxqNNdEfnsxUdDl+uLCGQNKl6JLfYr9BOdeA dfffo4UWKFRVi2NVkOIDcRKySODoymEAXQYQRbTIy+fYFuPv5j8IkTkTU3PBMNVXL4TN 9xWqaBeJWaVHZNhHgstNWVB/i2VU5XibZAiwvp1OIRE50ip3Y8krgo4d8mORXU56JVIC JA== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3kngnuu33t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:04 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2A77fB76025283 for ; Mon, 7 Nov 2022 09:03:03 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1anam02lp2049.outbound.protection.outlook.com [104.47.57.49]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3kpcqek6f5-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:03 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZGthWSkh+GN4Q6s4uCrCwToNdSelZ5HLXgpy7L3SI+UAEjCcvzuuXEdlQV6o854fShBpW/TPNiRyi/JIVqJf5YMZAm6DezGhm94znYbTZq0mucN2Ga16l8MhKANU9LYiYxQqhxpRvb9FfrO7wQO0qWz/rCxfQ0HYoTnWz8uQgh7ggJiA8IswJ8Zk08/KTzu+Q/5B6kDtFrnBdIgDTNjDJjobAQ1T9g2pjnmjOrqJVJpOYQFuAdw/DAvqzRW3LQFoAXgxev9aBuU+HyJXGwfOTjiDRrNb3LxTmpWsbjEhXLBZelEMmJPtCut4j8UwgcBlND9ktedMrbQcK3A4q74yrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9T0GlrN+YfkG79YJEffUTVVFSrGIFrV+2zA2f1qX1ts=; b=CT4cZ689ZQ2pgY958H+t3KVIPkEcHSvPaQp8R2lX+aXcmDxS8h7o5mGiIFZmmD/z0eazLtiHNEdflBAYslq6wnvwuHyk4Kc7bX6mAh4VEzh5PN3AdEvr1XQ8W/pUuWeb3caIhwFCvoe/IRod2rw4fuFjBANrcZbSNRy1rNvIDH5n6NhQwSQfK2jKTrHE8SqAZ5Og/IdT5cZ4o0aeCOcLbpBWWIjVk6JB6TtssCKzObrvbEuNSoGTCKG849kU2InUgU4HgVdnEEKNEfQBg4vYOWso8HmldIAOaMfl5iQIAQixfhiz4/0lZxyx5I95RMXz+zQGtOWFaiegrcSTjXABww== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9T0GlrN+YfkG79YJEffUTVVFSrGIFrV+2zA2f1qX1ts=; b=baYMDIDYQGOd6xO4JQs/t8dYd9bnqTOgKuEmjCwzynLUzIryGv1M69lQu24ycJYKYS8mlKJWa4SYaZIPQ3FyAnU8zGMa9D95QQFpevhAwN2qrD20gLm8SVRWl9nTh8AGTbU7woCkoQehndJjRrApGHBD/4lenKpzXv0UzvBWUiM= Received: from BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) by PH0PR10MB5848.namprd10.prod.outlook.com (2603:10b6:510:149::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Mon, 7 Nov 2022 09:03:02 +0000 Received: from BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3]) by BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3%4]) with mapi id 15.20.5791.026; Mon, 7 Nov 2022 09:03:02 +0000 From: allison.henderson@oracle.com To: linux-xfs@vger.kernel.org Subject: [PATCH v5 10/26] xfs: add parent pointer support to attribute code Date: Mon, 7 Nov 2022 02:01:40 -0700 Message-Id: <20221107090156.299319-11-allison.henderson@oracle.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221107090156.299319-1-allison.henderson@oracle.com> References: <20221107090156.299319-1-allison.henderson@oracle.com> X-ClientProxiedBy: BY3PR05CA0036.namprd05.prod.outlook.com (2603:10b6:a03:39b::11) To BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB4306:EE_|PH0PR10MB5848:EE_ X-MS-Office365-Filtering-Correlation-Id: 97d251d2-cded-4f1c-659b-08dac09ee01d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZqlUzilURloKOLNTsWQzyb1EZ8XOdKWZysdeYsknMPKAdlCMFRDIiC/DPrjSnxqPLV3tV68N3JCgBwk9hd2Ne1kRjdJtU7kgJt/si+SRNZc//ZREhBIC/v6odtDXyLA+h7ZNNSuGrnOuRnxn5w/Kv73YiWcSb10ny8wnxTPmnRuuULJ6H0WzwiA04m9ef4zvB4PEL9EdWaE8L0h5EMmeBYiLMLCsm9yHWup0P4onACPioUqiwdhhRqMKtdQOcoTeRIu7G2P/ugDujA47xFVT6IW+e7bi8B2K4UTIDGZ6VuirEVIbRlVkYVsGhwud8kTn3khdRZqR0KBeAyuDTP0tptn/ByTOEV5DGyMoHDL/6mIuTv+0QR+zk9RkRbHvEIMMxW7KI1B1rIxMRl7VRMh5bo05kqVEZI4uk9jKuSiD04T5qs/oY+k0ifWKIZpCTzN7C/3IDs+aZl4NDK8NP6JeQFR76Bd89V0XHPwhDaQB94kL4KEuk7S3oeQhdz7IDFJVhGKbAuGdJZd3mmnUn6XEhSE5Tkm2YFS+Rpg1v/wva++2ff8ze16sw3WZhXOhsbtrEX0rIt3TqfQgBK/kuX/vNZB52zGFjY9DmNl1AYjtXJQ9+yB06caT2q6E9yavJhpYz8AE0xSQYDAF3enSvM1iexyPUQ1meozgTzCvMuuW3RXJuJs82vz+5YEmFOgQQhVdBHp+K+9/3v3BMNF6LgDhTg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB4306.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(396003)(39860400002)(136003)(346002)(366004)(376002)(451199015)(36756003)(8676002)(66946007)(6916009)(66556008)(66476007)(83380400001)(2906002)(6486002)(41300700001)(5660300002)(8936002)(478600001)(6512007)(2616005)(186003)(1076003)(26005)(316002)(38100700002)(6666004)(86362001)(9686003)(6506007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: U+ctb/w6d8BTcKTX8oLG89kNIKUentuvSmBii6a5VtSFHs6hoC9zPMo2p0dD2Cr9SjNzG+/h0f+/R2SWUPLSg2lgTLt2W3qL4UE1ECfPPS98jUkaNVKe2B1jZEev7p2jRIkDwnat1xfenB/D4qzW0pWKiHlt2fQ2aWmxz6kH0x4nl+pSapZqg8jdLJf7nZdn78rjur4hWmfAoxvJoQw4T53fE6rTZaJidyXSb+E1eBBVneHqSntmimnH+iyHMc9POQ3wF5WF1FnYzz1BdLp43VysdXEQ0Kj5rqfIp/6g4YjljPdhmveb9P15f/HiPW7TdWY0RgLgKXchmQMHdTwEzNUSROTULzNX5l6r6m2Bh8fPDc1pQm8lbUHr5YGx2JRzpm6dn0ct3uK0VfGQ+YWtaQBZm+mONc4yFhnfQIu7GmyOTHGQECT8lbYA+j1mtzxQ+aHrLOf5aK0bv/8rRsEjfCAxkAYv3xPQCBrdfeqzvVzwTJGukNfdz5Xp41Yx+r9vnvOuoeO7Zcc35LV/ZXu/66xwhrC+hFxmgETPH2eI30gFejPKi+Fl1PN1sl7FXn7A5B6Isx7kJfQ5fFQ6haujLsPcv77fOL+zL7hAPFn1tdAnEd3rgKMA0lF5k33bIXjwYcVYSbnTcco/6QMV5JrFL5u91kUpqqQ2poUY+AD0zPqtRfn+25hnYVubv2DwiDuulsSEDlQMAUHrAd2QViui2HHO7OtB0FymYDYnlU3biC1WqP+KiiHwlezU0DR9YjlYbM7KCB6o6k0V6zBU5tmzCSWGmsUjE9BtPxKSHr12vUXlSBnXPv0nZ9cSQkWyGI1D5kf4QKJdTGI8248SohmvUcaa8uNU6L8ewrt5nI/1I4q1HOtwsDBU1hY8s4GLxX43dXl+5TUY2gLw9vo7O8fSLzmZAT7M/Ps7PWJtEvdfRD2BDKawfeL9WvpEttsnkKbx9BhyWySye2nIIa7ChfeflQ8WiJOi9h2vHNjSXYDRCNFxk0whDJa3n+l2AipHRLcPOHQFcLys7NLJC+CsmoecD2rPF7vMcanjKbXCJ6CO9rNJfHqCLn/KX5dOcVcq06AxyU6kwe54sstW74rjmP0W3WED/tILoeBWYXd34jjtQD7QlPJwlodzvEQLrflSGPBo3bIt9IyMQGVU/HkrcFGT2+3nVdvuc2WO73q/upmYfDI9Yqg0br4pPQAaB/7tywzSKDJJ/3qmGW7EKiY2IwPkKaizrGHpXK6kriFkYaVQerVQeKVXiyfYcw5US4EHteqXVQtiIi4SnoayVM+iTlhN7onrA8kHBkjvO6V0uNBMJPXFLB8jt5tZWGTMTNR0x9rbdEXi2CQ2gnUYzZWRgrVN9AtnWU1j8N/2VFlAsjwt4ZRCtJrwGZUCQjo1MGgdmZbLPiLvkyB0OGsvYadVAxrEWU7u1QPREe0EXKzRcXy/lbFpuQkvVfgbomqgQal6x4lx1Ecqbi6PRgwEoaE2bSkfsDYJpId9Rx+pYK0p4ZWaQU0wqstZMx6qWd2yhKpivONrz4IyoPWuOj4XUJHML9+uko7VL3+79T0qliiWWaRcPYnQqoxGP2MWi+vfN6i8Cux6SVi8PZd8I0GrVP69yt4npg== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 97d251d2-cded-4f1c-659b-08dac09ee01d X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4306.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2022 09:03:02.4829 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 1BjKxnMpuq2995jHuhXT/sChrWw4w3Jj0hffJNV9bM+sz4txcm2ZJHB54QvvVrsouNITI3kSpscoavRp8cBGpXwbgEMoxL4t6EEfE2BXY9U= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5848 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-07_02,2022-11-03_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0 mlxscore=0 suspectscore=0 spamscore=0 malwarescore=0 bulkscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2211070076 X-Proofpoint-GUID: doY5KDcyoLaaGwNBBsZsQvEH2UcYyaAD X-Proofpoint-ORIG-GUID: doY5KDcyoLaaGwNBBsZsQvEH2UcYyaAD Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Allison Henderson Add the new parent attribute type. XFS_ATTR_PARENT is used only for parent pointer entries; it uses reserved blocks like XFS_ATTR_ROOT. Signed-off-by: Mark Tinguely Signed-off-by: Dave Chinner Signed-off-by: Allison Henderson Reviewed-by: Darrick J. Wong --- fs/xfs/libxfs/xfs_attr.c | 4 +++- fs/xfs/libxfs/xfs_da_format.h | 5 ++++- fs/xfs/libxfs/xfs_log_format.h | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c index b1dbed7655e8..101823772bf9 100644 --- a/fs/xfs/libxfs/xfs_attr.c +++ b/fs/xfs/libxfs/xfs_attr.c @@ -976,11 +976,13 @@ xfs_attr_set( struct xfs_inode *dp = args->dp; struct xfs_mount *mp = dp->i_mount; struct xfs_trans_res tres; - bool rsvd = (args->attr_filter & XFS_ATTR_ROOT); + bool rsvd; int error, local; int rmt_blks = 0; unsigned int total; + rsvd = (args->attr_filter & (XFS_ATTR_ROOT | XFS_ATTR_PARENT)) != 0; + if (xfs_is_shutdown(dp->i_mount)) return -EIO; diff --git a/fs/xfs/libxfs/xfs_da_format.h b/fs/xfs/libxfs/xfs_da_format.h index 25e2841084e1..3dc03968bba6 100644 --- a/fs/xfs/libxfs/xfs_da_format.h +++ b/fs/xfs/libxfs/xfs_da_format.h @@ -688,12 +688,15 @@ struct xfs_attr3_leafblock { #define XFS_ATTR_LOCAL_BIT 0 /* attr is stored locally */ #define XFS_ATTR_ROOT_BIT 1 /* limit access to trusted attrs */ #define XFS_ATTR_SECURE_BIT 2 /* limit access to secure attrs */ +#define XFS_ATTR_PARENT_BIT 3 /* parent pointer attrs */ #define XFS_ATTR_INCOMPLETE_BIT 7 /* attr in middle of create/delete */ #define XFS_ATTR_LOCAL (1u << XFS_ATTR_LOCAL_BIT) #define XFS_ATTR_ROOT (1u << XFS_ATTR_ROOT_BIT) #define XFS_ATTR_SECURE (1u << XFS_ATTR_SECURE_BIT) +#define XFS_ATTR_PARENT (1u << XFS_ATTR_PARENT_BIT) #define XFS_ATTR_INCOMPLETE (1u << XFS_ATTR_INCOMPLETE_BIT) -#define XFS_ATTR_NSP_ONDISK_MASK (XFS_ATTR_ROOT | XFS_ATTR_SECURE) +#define XFS_ATTR_NSP_ONDISK_MASK \ + (XFS_ATTR_ROOT | XFS_ATTR_SECURE | XFS_ATTR_PARENT) /* * Alignment for namelist and valuelist entries (since they are mixed diff --git a/fs/xfs/libxfs/xfs_log_format.h b/fs/xfs/libxfs/xfs_log_format.h index ae9c99762a24..727b5a858028 100644 --- a/fs/xfs/libxfs/xfs_log_format.h +++ b/fs/xfs/libxfs/xfs_log_format.h @@ -967,6 +967,7 @@ struct xfs_icreate_log { */ #define XFS_ATTRI_FILTER_MASK (XFS_ATTR_ROOT | \ XFS_ATTR_SECURE | \ + XFS_ATTR_PARENT | \ XFS_ATTR_INCOMPLETE) /* From patchwork Mon Nov 7 09:01:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allison Henderson X-Patchwork-Id: 13034131 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4B54EC433FE for ; Mon, 7 Nov 2022 09:03:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231346AbiKGJDK (ORCPT ); Mon, 7 Nov 2022 04:03:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33536 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231432AbiKGJDH (ORCPT ); Mon, 7 Nov 2022 04:03:07 -0500 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0EF341658C for ; Mon, 7 Nov 2022 01:03:06 -0800 (PST) Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 2A75fMHL025318 for ; Mon, 7 Nov 2022 09:03:06 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=u8ANFXJemEPEl5G2uQUXpknnREMAMf1WLaiUz9lWhI8=; b=EtmUEgS3QIf8cel/odhKm2nsx//jgEDbl8mBDhiCiJXwAZumNFVZUOF8R/+dGs1EYUFn R+7C/DQe6duSV4aLugNpuVj0saZOqMq0EsfvqyPp7eTRuxFzNdMXK1xBjsubj6fDBCoF hIwby8SspiDzto8K4mlTDsF5rvtq7MXf8KqvaiVoBqRokKB4Q9U6HUEy9kosx63CxLPL 2ZmsmVYkydS/uoVbIUVj9drMHgmBKnl5AkJ9lYxShhocOYrV5Ar16L3X4AT5EvadNMZI O5H/hv25phDZO3F0rstM2gpXDibVqq8OLg65KWd5qt5j3/iV2g4Swh6js6LRSZTrrAFm ww== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3kngmj30j5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:06 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2A76im0I023134 for ; Mon, 7 Nov 2022 09:03:05 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1anam02lp2041.outbound.protection.outlook.com [104.47.57.41]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3kpctj2kgu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:05 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EJtfqjaLWKBRHTFerksbG27dxmQxDyX/v5NS3YlZtXQeEWd+/WrZf53b4tqbUzZUX8s6xaFJ6jx9HvUcdAAe+CR1y6DfB7pb0rZ/aPIQcEg6JifzItCUjRe7nLMBOgulWEcxFM5m5I6XcbOb5E8hKGd0w4H6DqLA2fcUfB3lf6Txpm3K+4jX4OE+ZaqNuVFiDG3KcFDHs8rGfh9+ip0B2PbVD8SSWdo1pxatY5Wena7y8V28LWE1NWPhBTO2tqmeGkWqgXfVbI58vFTXkM8YcKOGGc+DyOSdA11by1bhZCbOTktG/qW8XsP2wWqpyxJjrU+F1LLDzIIFJequ3hFAVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=u8ANFXJemEPEl5G2uQUXpknnREMAMf1WLaiUz9lWhI8=; b=XkFasp5S+Tg9ZG/2lddXcfJrHMDtn3SENG8p1C6Griyb1REhkqIlnkjY+qzBD7GNlEMYbeab5fCkUbJVjuxp//TzrClDHNOUZCjfXPvxKMC0+iJFdyrl3gsG5U0wxMCznAIwP+p1EvbM9ceaL6ywsCZVi0sqKPxp8gYYjWt3w0z4Vrt8ugmUyVwTKMEWqmaLL/wE9HbxNXcGYjibkGAPZHEtVT0uFCOczXuJIm8eePHa57+Pp/J3s8esv1YJAfqppr7XV5j84udLONeJ6YwcWgqAnhP9kdZiqJMae6Hftc7OB8fkp4tHhrpLO2ZW39qif7s/08D6b7BNDElqPJJq1g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=u8ANFXJemEPEl5G2uQUXpknnREMAMf1WLaiUz9lWhI8=; b=Rxs9l13AJ+e4l/v9kVLnCCmHsTUbSbKGh0ukkNgK6t8rrB4F60DGjl6sP8CGPA1qsmVRYu/43XUTUBBcSDN4618o4xrvqFAsccU/uTXAg8KlPxn6psNSo6HZsb4uqsW4bqBRelq2VQQVc1pTr/dOWimy8cgszSWR4QzeIf3Nssw= Received: from BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) by PH0PR10MB5848.namprd10.prod.outlook.com (2603:10b6:510:149::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Mon, 7 Nov 2022 09:03:03 +0000 Received: from BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3]) by BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3%4]) with mapi id 15.20.5791.026; Mon, 7 Nov 2022 09:03:03 +0000 From: allison.henderson@oracle.com To: linux-xfs@vger.kernel.org Subject: [PATCH v5 11/26] xfs: define parent pointer xattr format Date: Mon, 7 Nov 2022 02:01:41 -0700 Message-Id: <20221107090156.299319-12-allison.henderson@oracle.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221107090156.299319-1-allison.henderson@oracle.com> References: <20221107090156.299319-1-allison.henderson@oracle.com> X-ClientProxiedBy: BYAPR11CA0066.namprd11.prod.outlook.com (2603:10b6:a03:80::43) To BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB4306:EE_|PH0PR10MB5848:EE_ X-MS-Office365-Filtering-Correlation-Id: 85d8f7b8-a618-4c5f-a029-08dac09ee0c6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8kc66a6Xfu3qi9Rq+aKjrWEZxI98GJQhEi+fU3ETNq/UEhr64c7dHdRaeP9rWMa1j+z+zPXonWV7ViXeL9fTWo7vdC1zYuCmm/FkUMNI38VjAciWPFuVPfpxcug9FXED+Hv14M6luwJE2WU2u+iAIvMKl6RzK/wq+XHBiLaMmUvRQKHn3U6eBzpCUu05xParOkT4veOaoIDPuNvADLoO8/dfU74csT5ydc0croGfeATrlWc4PwYeUqbVgTlpysu2BuyMInUT2R/gtnxZhu/sYzBRG2uVL9WmAzfC0w2ELHg0sbA++pUiHF9jgyU9JMsrrIKcs/K0o5TP9rrhCzeXRc8aUDvTw2E7L2WeP1dFWmJCYqeUblnV6+nLiNHg3cxqgftHQmKe/9hm1GHxrH6ccs61auRv1tw2CNaqw3YxOE/ParAckchSBB/UKqzYd1baloFqVgvvj/Ex480kgbHCMPPfeafGJP0VaV8wY4vfne9/8yYC+hk5w/MAIS3xZvHvOYXPm4SMWeWYnWbiniUnSgorJS0EYyNvVCgDOZbiDUgR8hOTfo/YYsEIpTKFQTXJdl7KtBgPXB1HDFdiAXm4oZf2RhrUSEfy6zHNy27pc3o6nKxq6EVhBkLl4GQuC4Usto6iND5w/5zoKRwdwPuCmWo2tOkjt/HrQxXG5fXLO8fyZvmy5M5Ed2h6XcB3DiqLQhNpFPa8GK9RiVE6O2t+2A== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB4306.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(396003)(39860400002)(136003)(346002)(366004)(376002)(451199015)(36756003)(8676002)(66946007)(6916009)(66556008)(66476007)(83380400001)(2906002)(6486002)(41300700001)(5660300002)(8936002)(478600001)(6512007)(2616005)(186003)(1076003)(26005)(316002)(38100700002)(6666004)(86362001)(9686003)(6506007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: y9UqRqvPr0mqN/mqrT6bo2+5vCksZifBYT7Ia9UXWJsA2mzuGfDa2JJuHyT8FJ7QS7o79bzDZSTXQ9XStYVGUgB54Rdu9ZMRnxPOQaE1SaJJkuyfQvb1q+4hnijIvo8IadsOqNNrVs3Ph2RRsDroYDwDoqlX3a9uqIedm6AhM79eCbjkFJAYkneHHlnL+gcmQMo9r/y77F9pC5jQxm315r4RZuJ1JRe1c06n1cNYD+T6G5E+N143DMXO6BZ9vt0GbMj1w9QvmDcTLniz6vWXvW4aOwMipMa2rL2STX9nKTWhU4uD+49XAvHb3BacM9s9sqkRG17ovqWLlxZiyXN9rqlLdNrOTAQ6FsA8Te7AMaAVg3qvVGFSkuxMQws4pXvjqXftVYSrE08TflEG2Rm9uOutyH9Y3sX6drmo5SqqLENoYHMkwErjN8LPJK4poqOijph9Clzlc1mKSkTvI1k7Q05ZEcI+Qe2eU2D53+Y61O1IGIYj8mySjAOXr2mr67x9cCSmibWzOyELOa3mYQlhhWq+wC1bUJzh+7XSxl8BoUks3jkJM0XSeGp/bqobQ57OfHgeK7QaYiXG+Ay0mPuudGjwiqrR8bU0Gdh6d5d0oxw+r5CMvSr+BfeJ7aCwu6dvvSPIUbKPyqIKz2ANLOH7EJ9HBQiy3jB1wIVlf+XO8qmHiJuhs+Ixs5TK8L9yswKCw1ws2nsIYsoIQ4KBN5R6H716s2GCW/Vyjp6H7mfQykXhxsUYQRCkwrmPg4EK+8C86cltU1cisYZtiZWVsVfn5Odb4kIzFa3sQR5dCtJWAvELvOc79EemUlQTmGTkn2+NpezddPxAn+k0VvC5rveecvY59cCIKU0yQz7R0FUbDWkJuAfjq8AQUpdXCn/gq+jciL8/v4jujebkaY6Gn9IvAgxF2EuaHobkPuAMcENNG2W2AeuoNQwC2u348X58DGfFVBuSjIk22QlqRXkxRwNkITelYEIQtCCWHGjhjCkI3rt71A7QK9RpSMjJcVtVV4LT52WqfyNklvb43EYCxvumLUcDuPipOwt0poEbcp8ac41HLVlQfr9y98yaQOKTeh49MGkfxyrKoK2BGBytCa/QMPMB9zwuCZXExybWwgKfUfLHi8HxtOaDRYorZJdl02YZTAFXSupWhJzuWLNRz8boMZSz6VyKdLf0zM3zASKAwbFVwWJnUtwbxLCnZZtnsio2LqyLUTO81+PqrstUDH4qEjm1Xh335iZUVh8cRmn+th4RdSjxl4eVqRGIaTW8WDQ8qzHZCR6N2tmLcm2mn+73YgFhLJmEr5+iWzXwZ/r8M9lJyBlgygzufSFMfdtgjWMUjYw9mhonrfDp/mYRstrs+7d0BVtD5tsnDoqMGD3NdtKdxSBaBBgl57HRbZu1KqLAyLspRYYS4xE7zIu7aPd61TxaV8TTL0Q1Lbd5WMXDAO0fnM0O7NiBxZortbXIfm2p21HQ5L3HqvDNXdntSxO8gEnOqsDdgXxdUKPbJUFd3cWDDKw2/jV0jtMfmwh39x47pGC9lxH9EMDjGpLKhY0ZJ2utgLZNNRIUmCFH9VudAQNlb4XCd8cAEvoHKU6GLWt0rG9c9+NkwhDuYDE9Ea4XJg== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 85d8f7b8-a618-4c5f-a029-08dac09ee0c6 X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4306.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2022 09:03:03.5607 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: uEXgwszy0aZHcJnMOyWMcVmkVarabkqfwml0xKvWLKu9n9G4MNuYWNVUjprG67CC+1T6iWLRX7Q80XKfZCxLG1wbcfSov975pXsO/8z/8UE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5848 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-07_02,2022-11-03_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 spamscore=0 bulkscore=0 adultscore=0 mlxscore=0 suspectscore=0 malwarescore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2211070076 X-Proofpoint-GUID: 0Bh6Wp46CFw8PJyCReGK5G8trmsME1h_ X-Proofpoint-ORIG-GUID: 0Bh6Wp46CFw8PJyCReGK5G8trmsME1h_ Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Allison Henderson We need to define the parent pointer attribute format before we start adding support for it into all the code that needs to use it. The EA format we will use encodes the following information: name={parent inode #, parent inode generation, dirent offset} value={dirent filename} The inode/gen gives all the information we need to reliably identify the parent without requiring child->parent lock ordering, and allows userspace to do pathname component level reconstruction without the kernel ever needing to verify the parent itself as part of ioctl calls. By using the dirent offset in the EA name, we have a method of knowing the exact parent pointer EA we need to modify/remove in rename/unlink without an unbound EA name search. By keeping the dirent name in the value, we have enough information to be able to validate and reconstruct damaged directory trees. While the diroffset of a filename alone is not unique enough to identify the child, the {diroffset,filename,child_inode} tuple is sufficient. That is, if the diroffset gets reused and points to a different filename, we can detect that from the contents of EA. If a link of the same name is created, then we can check whether it points at the same inode as the parent EA we current have. Signed-off-by: Dave Chinner Signed-off-by: Allison Henderson Reviewed-by: Darrick J. Wong --- fs/xfs/libxfs/xfs_da_format.h | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/fs/xfs/libxfs/xfs_da_format.h b/fs/xfs/libxfs/xfs_da_format.h index 3dc03968bba6..b02b67f1999e 100644 --- a/fs/xfs/libxfs/xfs_da_format.h +++ b/fs/xfs/libxfs/xfs_da_format.h @@ -805,4 +805,29 @@ static inline unsigned int xfs_dir2_dirblock_bytes(struct xfs_sb *sbp) xfs_failaddr_t xfs_da3_blkinfo_verify(struct xfs_buf *bp, struct xfs_da3_blkinfo *hdr3); +/* + * Parent pointer attribute format definition + * + * EA name encodes the parent inode number, generation and the offset of + * the dirent that points to the child inode. The EA value contains the + * same name as the dirent in the parent directory. + */ +struct xfs_parent_name_rec { + __be64 p_ino; + __be32 p_gen; + __be32 p_diroffset; +}; + +/* + * incore version of the above, also contains name pointers so callers + * can pass/obtain all the parent pointer information in a single structure + */ +struct xfs_parent_name_irec { + xfs_ino_t p_ino; + uint32_t p_gen; + xfs_dir2_dataptr_t p_diroffset; + const char *p_name; + uint8_t p_namelen; +}; + #endif /* __XFS_DA_FORMAT_H__ */ From patchwork Mon Nov 7 09:01:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allison Henderson X-Patchwork-Id: 13034132 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D950DC43219 for ; Mon, 7 Nov 2022 09:03:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231294AbiKGJDL (ORCPT ); Mon, 7 Nov 2022 04:03:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33574 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231338AbiKGJDJ (ORCPT ); Mon, 7 Nov 2022 04:03:09 -0500 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 19A4115FC0 for ; Mon, 7 Nov 2022 01:03:08 -0800 (PST) Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 2A764BZr018998 for ; Mon, 7 Nov 2022 09:03:07 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=FuweUXNs/mHpq8tcHmEQakMY6UvqeZF7ltV3oypreb4=; b=HrjmXigQC6l+ySPK2pgmTXFQDTcwSRjqX9uNdA5PzeVzCTOTrt2ZEMxTUxjcXxfGPVJV CZXYrhNYIdynF6W954aFca1umBR0Mk/94L6TmYv59aAARiNs2gMGuk7i+OdDNYu3sOgm PkeTTsdd8SLCKd//0cSmnvsWr8vuTa6NdWbQ0EzUZV87myI6/6rjMKmQNvOBvZoi13QT ENY/cNvLhJVmn+Go0e40eYMUyE+B0GiDbX2nYhq5sYlrKOSOtKJAUfClbMmyrJLuOjZD OyzhOCGWZvvV14uAWU7Vaoybs9FHJoVr1xu+byqE0LLnoh/F08m7HOZO8KN2P8pIa6S0 ug== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3kngmj30j7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:07 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2A77lfFn022925 for ; Mon, 7 Nov 2022 09:03:06 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1anam02lp2045.outbound.protection.outlook.com [104.47.57.45]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3kpctj2kh6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:06 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ljzN0wTlAYYmx6EJeqondMZKQ5Js8YbFJA0Taj2CvzSA9ZGDnUVHjLNqgft9f2ST6LVNKhl3NPjp26AZkpcEvF9i4hIhbh7BqpO2upF2pQygUc1TocsKklvDUp9Wse+cipoaFU2n+JiZxNJQONy0TMmUZxQ2VrBV2kt5PQhuZomQRzHBjYUU4F6eoZqT3xvc86QRrOvpclgC8Bd4fQcgqzrKCmmSKz9u9YRviwUFOpO4ffITmi2PrEhdVY4RbN4WN5l+PbJKoy+cMFxClOusrMJSIcFon5ZZyd/YryqlbIXFc9off/8JpyjOt5QnE098t3NQrFY2beR7y17Wd+I0cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=FuweUXNs/mHpq8tcHmEQakMY6UvqeZF7ltV3oypreb4=; b=a8L1KGXCEcK15iMlE3fAhFnE+Dw1TeTPYUOViUPxQEBCvXmAHE+d/6gOKE9JtHZCxTiPRDb1AhSYbILRD59/m9qhCqrHYlaL4/FW/77xURruP/JFxvfhcB6QbUTtR1xXR3ZZiVHsqH1uOLqijzXZ1v4xxExLAO8TL6sEzRZ87gG3FyfrZAC0w2FX+gf6SzW4xcEgbPagvY5M507vyBxwPeDk4TulZJ1Ad7MfsGD0uM1Gam/7V85uAVZGMLuZLp20DjtvzHPwtWV7LHeRhBWTbY8CPRJeqIZXBsYZUKWUHkfhBUrvMinW6C0Hqjt9NfALGSgweccKGqKSd6ZbaF791w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FuweUXNs/mHpq8tcHmEQakMY6UvqeZF7ltV3oypreb4=; b=JvAuKcM7gEnWN94k7Jv4vsdxJ36cSIGg3kPq/zhvedY+XMIEsUfCHHoi1AoRsiwlXUJ6Hm37dZvjY6yv8uJlOGYYRDxD9OBR2Qiqp71QX0bKbSjOq3wObDRhls/zBN2bduykdN1kP7gMK1orcAqVp8PF+YnqNnqrL6bHMTiD2L4= Received: from BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) by PH0PR10MB5848.namprd10.prod.outlook.com (2603:10b6:510:149::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Mon, 7 Nov 2022 09:03:04 +0000 Received: from BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3]) by BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3%4]) with mapi id 15.20.5791.026; Mon, 7 Nov 2022 09:03:04 +0000 From: allison.henderson@oracle.com To: linux-xfs@vger.kernel.org Subject: [PATCH v5 12/26] xfs: Add xfs_verify_pptr Date: Mon, 7 Nov 2022 02:01:42 -0700 Message-Id: <20221107090156.299319-13-allison.henderson@oracle.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221107090156.299319-1-allison.henderson@oracle.com> References: <20221107090156.299319-1-allison.henderson@oracle.com> X-ClientProxiedBy: BYAPR05CA0069.namprd05.prod.outlook.com (2603:10b6:a03:74::46) To BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB4306:EE_|PH0PR10MB5848:EE_ X-MS-Office365-Filtering-Correlation-Id: c8adf814-d5b5-491d-8482-08dac09ee15c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LQi6bJk/5KTgMwK/ilO6lBaMDAb13vjUMkohE+m5/Gj0q+OrK0zhYxQgkg2lpoWb7bfsoU3zyemGHPv+bd6nXP0AUX9c4vHmpL3+YGnenzJV89eEPSd6aa+XzbBWlr0oiN1rBiNa30JxyKWOnDYyMhwWhhVcbheZdyhZfTZhTSYjRc54+MPyHd0YXFerPDT/E6SV+4RsL7Aq0hb5i5cLw5J5Fsg+X5O1OhdMIOZ2xMYwHAgn/2UID1FKq31x63j1Q5aW8UrP36/pTcUUh37eQDBZ0+C4qZff2MzpkIQ7bte523RQQOxuXJN5CQMhsdOKHWI67qa3HJc8aCRa5Xki/Q+2B/N2uFAcy0FNCesLPLrR17s4Na4srnDz6pwygAznSGBfyFo7VMhul+Q6Di43xVR9nxt5SeTtNtRJveItH/djdEXU66faUKbzbl+Hg1BJhpdP7c4LxuGBGd1lqSBIFLpn7p9MygCsjclrpc2GjTVVCKmDMtkDqkxtx+n5QHljY1UMSR0KvM3KwkgKhg7XQl468T0Eno2I0fiTFagQzsDe1vspWIv8g+3yCcuVKp4CdQKHzNZtgfnQsaV4TQsj+WMBkIGV7sBb5inMpqAHdVQOiOPcHMmrzyjNVOFGwsYFqhM++p7D06HiuMSP+DkBaPDh0kAIntuZBGKBKwyTX61nuHoIDTN3C2QZx8+MsuHqgpqybP1il4X9Ssj0SREIZA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB4306.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(396003)(39860400002)(136003)(346002)(366004)(376002)(451199015)(36756003)(8676002)(66946007)(6916009)(66556008)(66476007)(83380400001)(2906002)(6486002)(41300700001)(5660300002)(8936002)(478600001)(6512007)(2616005)(186003)(1076003)(26005)(316002)(38100700002)(6666004)(86362001)(9686003)(6506007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: a2thFBv7LXKNYv6PIgDNGCTupErpEUK6DTZPjsGBCOJHj4W8NYvSrLid12gxFqV60Qz0cp4Ig+gO/79FfxqLJFWl9/CFVIbl+9fnl7qzUXeG9SWFguxpHk7EnHPv2n14lxydHBJ6AoMgQK8ENcxvY9bn4/QTrLKPJgMD0DaJgtqSbBqRZoW1E+zcQKbYhb0GpFVV97/TKRCih4xc6iB9eFdu2NR/CdZLKXbtHBTEr2zqJm5vRd34UFsYfkNWQLCSfbwfAwHdRQ07b48u1Zx/h9FQG+saKBYuce+q9n/cXddjseSz4DSdEe4SzCB/Fqa6c912PmKQAtDAplK4i83qtTgOJB/gtZRc7K/iLz1qzDGWDdgE88mA2DTfleMC9M9ae6d110SJpz/6GtHAz1qMBOGamiubV+VNwQx+Bgg+lVxWf1OgEr9Nchz7pVxk3nYSIw38YB1XDTDat1QMEFKcmMyy2faApfows9GbuABzKrmC7S8VCUDat/Y3yVs3W3Mj6/+06LIoS2koqGuJrQQ1iv+ZzZn1UoHakYFTRabeU4wYZVbyqK0ntWTzw+hqq28ecYh+rqzMDIkB9z10Rc04/165Epvp/7+etzUkAHTxp977SmYbkBOvInPrJbr7Yv/DOb2LEE1OJybef1vGbnv/JbHHvBhOw/HZECLwCdRJrlv1LZ913+bPzN0nAFyf73xEnWrVOv6uBQ+fXJtYL43yHpcexZ8ep88zNxp60jrbsTjCrjQA+jZcz21nhQFZtsx/003r+DnCVpYEETzeBze1AAzlGahpYbgG+jprrRF7Nvaxz6DUSiXXqeaJe8GZrRSqOsk9tsTm2+TUALLTJ+/JQ3qpDmAIXzOdDrmQGE1avj/vX0eIcOY9k64RHDWyjrfoFkv1WUDhhdDOWBHwIGMWWcysQCPJkPlD2J5jfI3N9mvenFVKlsnfbtutYtw/GFs+yDRhDf8lPfzzOqGUaWEFE52btDhq2+TGHwE90iUJWmOHwchfNf1ZQRb4AwwK+6HzKH6z0zccSoRBE1SYRhYRPwSDjX3Sw7xhUGmd92e4SSjmZMj2Gr5mW2HwXaqqW+6OAI87kfeV48unwVqnFgqgC085Fx9HFgs438yndH0mktMqXIWTsjoL5iJB+CDVKlyiM/YslPAsk3AalhaFGScRYrpvMcIKw8DpDD0E5wfJ5MHwxGN1NRT1vcKnXfQ29EmzL09G3prBeUkI7ZVFkYj2ugQYmrBZUTZa7G3iEkJKhiT+R7MFCnSBlKb7lyCnPGjV7DmGhLAjQqW/1z0h93T49hwGKl3YLiq/frOFenet1DLh/z18hAfJaQ0u4Upema3Xx0INkjEGJrGWwKcBKh/+hBTO5P3Kk/YM3TZmz35SUPsmZdGUJeKFZyapHntTY88/DYvPsaRkvQeuuaShngluC1ygAAFJL3QwS7zC54vMWP4LDZyZmiQaNpl+6ZMe2S1De8eAQVKPS5WPAZxkuMOml4qSm+G9MkEAnH2oUn+E7Yon0paAhWnmFLVl2H9pS7EZ2752QqhcrXWIHByJFyI/yWc3uVYmdzs3+qnn8p/z5J0OaaQl3L+gh1xQmknF1olsGHVxjQVGaoilMTX/dmFNrg== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: c8adf814-d5b5-491d-8482-08dac09ee15c X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4306.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2022 09:03:04.5743 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: lcdQ1xnItRqevVlCRNUgNFIXu5LpJLQ5X8HP4bPU+gFFWgo7m67Az0RAkiG35jQa+js7tyjfhEYqfAPqUNRCAu0ayjd6lEism7ywiRLxQxU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5848 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-07_02,2022-11-03_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 spamscore=0 bulkscore=0 adultscore=0 mlxscore=0 suspectscore=0 malwarescore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2211070076 X-Proofpoint-GUID: zwz6X2Bx9NMF7BOQL14XsakwVQi3Fa8T X-Proofpoint-ORIG-GUID: zwz6X2Bx9NMF7BOQL14XsakwVQi3Fa8T Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Allison Henderson Attribute names of parent pointers are not strings. So we need to modify attr_namecheck to verify parent pointer records when the XFS_ATTR_PARENT flag is set. Signed-off-by: Allison Henderson Reviewed-by: Darrick J. Wong --- fs/xfs/libxfs/xfs_attr.c | 47 ++++++++++++++++++++++++++++++++--- fs/xfs/libxfs/xfs_attr.h | 3 ++- fs/xfs/libxfs/xfs_da_format.h | 8 ++++++ fs/xfs/scrub/attr.c | 2 +- fs/xfs/xfs_attr_item.c | 11 +++++--- fs/xfs/xfs_attr_list.c | 17 +++++++++---- 6 files changed, 74 insertions(+), 14 deletions(-) diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c index 101823772bf9..711022742e34 100644 --- a/fs/xfs/libxfs/xfs_attr.c +++ b/fs/xfs/libxfs/xfs_attr.c @@ -1577,9 +1577,33 @@ xfs_attr_node_get( return error; } -/* Returns true if the attribute entry name is valid. */ -bool -xfs_attr_namecheck( +/* + * Verify parent pointer attribute is valid. + * Return true on success or false on failure + */ +STATIC bool +xfs_verify_pptr( + struct xfs_mount *mp, + const struct xfs_parent_name_rec *rec) +{ + xfs_ino_t p_ino; + xfs_dir2_dataptr_t p_diroffset; + + p_ino = be64_to_cpu(rec->p_ino); + p_diroffset = be32_to_cpu(rec->p_diroffset); + + if (!xfs_verify_ino(mp, p_ino)) + return false; + + if (p_diroffset > XFS_DIR2_MAX_DATAPTR) + return false; + + return true; +} + +/* Returns true if the string attribute entry name is valid. */ +static bool +xfs_str_attr_namecheck( const void *name, size_t length) { @@ -1594,6 +1618,23 @@ xfs_attr_namecheck( return !memchr(name, 0, length); } +/* Returns true if the attribute entry name is valid. */ +bool +xfs_attr_namecheck( + struct xfs_mount *mp, + const void *name, + size_t length, + int flags) +{ + if (flags & XFS_ATTR_PARENT) { + if (length != sizeof(struct xfs_parent_name_rec)) + return false; + return xfs_verify_pptr(mp, (struct xfs_parent_name_rec *)name); + } + + return xfs_str_attr_namecheck(name, length); +} + int __init xfs_attr_intent_init_cache(void) { diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h index 3e81f3f48560..b79dae788cfb 100644 --- a/fs/xfs/libxfs/xfs_attr.h +++ b/fs/xfs/libxfs/xfs_attr.h @@ -547,7 +547,8 @@ int xfs_attr_get(struct xfs_da_args *args); int xfs_attr_set(struct xfs_da_args *args); int xfs_attr_set_iter(struct xfs_attr_intent *attr); int xfs_attr_remove_iter(struct xfs_attr_intent *attr); -bool xfs_attr_namecheck(const void *name, size_t length); +bool xfs_attr_namecheck(struct xfs_mount *mp, const void *name, size_t length, + int flags); int xfs_attr_calc_size(struct xfs_da_args *args, int *local); void xfs_init_attr_trans(struct xfs_da_args *args, struct xfs_trans_res *tres, unsigned int *total); diff --git a/fs/xfs/libxfs/xfs_da_format.h b/fs/xfs/libxfs/xfs_da_format.h index b02b67f1999e..75b13807145d 100644 --- a/fs/xfs/libxfs/xfs_da_format.h +++ b/fs/xfs/libxfs/xfs_da_format.h @@ -731,6 +731,14 @@ xfs_attr3_leaf_name(xfs_attr_leafblock_t *leafp, int idx) return &((char *)leafp)[be16_to_cpu(entries[idx].nameidx)]; } +static inline int +xfs_attr3_leaf_flags(xfs_attr_leafblock_t *leafp, int idx) +{ + struct xfs_attr_leaf_entry *entries = xfs_attr3_leaf_entryp(leafp); + + return entries[idx].flags; +} + static inline xfs_attr_leaf_name_remote_t * xfs_attr3_leaf_name_remote(xfs_attr_leafblock_t *leafp, int idx) { diff --git a/fs/xfs/scrub/attr.c b/fs/xfs/scrub/attr.c index b6f0c9f3f124..d3e75c077fab 100644 --- a/fs/xfs/scrub/attr.c +++ b/fs/xfs/scrub/attr.c @@ -128,7 +128,7 @@ xchk_xattr_listent( } /* Does this name make sense? */ - if (!xfs_attr_namecheck(name, namelen)) { + if (!xfs_attr_namecheck(sx->sc->mp, name, namelen, flags)) { xchk_fblock_set_corrupt(sx->sc, XFS_ATTR_FORK, args.blkno); return; } diff --git a/fs/xfs/xfs_attr_item.c b/fs/xfs/xfs_attr_item.c index 95e9ecbb4a67..da807f286a09 100644 --- a/fs/xfs/xfs_attr_item.c +++ b/fs/xfs/xfs_attr_item.c @@ -593,7 +593,8 @@ xfs_attri_item_recover( */ attrp = &attrip->attri_format; if (!xfs_attri_validate(mp, attrp) || - !xfs_attr_namecheck(nv->name.i_addr, nv->name.i_len)) + !xfs_attr_namecheck(mp, nv->name.i_addr, nv->name.i_len, + attrp->alfi_attr_filter)) return -EFSCORRUPTED; error = xlog_recover_iget(mp, attrp->alfi_ino, &ip); @@ -804,7 +805,8 @@ xlog_recover_attri_commit_pass2( } attr_name = item->ri_buf[i].i_addr; - if (!xfs_attr_namecheck(attr_name, attri_formatp->alfi_name_len)) { + if (!xfs_attr_namecheck(mp, attr_name, attri_formatp->alfi_name_len, + attri_formatp->alfi_attr_filter)) { XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp, item->ri_buf[i].i_addr, item->ri_buf[i].i_len); return -EFSCORRUPTED; @@ -822,8 +824,9 @@ xlog_recover_attri_commit_pass2( } attr_nname = item->ri_buf[i].i_addr; - if (!xfs_attr_namecheck(attr_nname, - attri_formatp->alfi_nname_len)) { + if (!xfs_attr_namecheck(mp, attr_nname, + attri_formatp->alfi_nname_len, + attri_formatp->alfi_attr_filter)) { XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp, item->ri_buf[i].i_addr, item->ri_buf[i].i_len); diff --git a/fs/xfs/xfs_attr_list.c b/fs/xfs/xfs_attr_list.c index 99bbbe1a0e44..a51f7f13a352 100644 --- a/fs/xfs/xfs_attr_list.c +++ b/fs/xfs/xfs_attr_list.c @@ -58,9 +58,13 @@ xfs_attr_shortform_list( struct xfs_attr_sf_sort *sbuf, *sbp; struct xfs_attr_shortform *sf; struct xfs_attr_sf_entry *sfe; + struct xfs_mount *mp; int sbsize, nsbuf, count, i; int error = 0; + ASSERT(context != NULL); + ASSERT(dp != NULL); + mp = dp->i_mount; sf = (struct xfs_attr_shortform *)dp->i_af.if_u1.if_data; ASSERT(sf != NULL); if (!sf->hdr.count) @@ -82,8 +86,9 @@ xfs_attr_shortform_list( (dp->i_af.if_bytes + sf->hdr.count * 16) < context->bufsize)) { for (i = 0, sfe = &sf->list[0]; i < sf->hdr.count; i++) { if (XFS_IS_CORRUPT(context->dp->i_mount, - !xfs_attr_namecheck(sfe->nameval, - sfe->namelen))) + !xfs_attr_namecheck(mp, sfe->nameval, + sfe->namelen, + sfe->flags))) return -EFSCORRUPTED; context->put_listent(context, sfe->flags, @@ -174,8 +179,9 @@ xfs_attr_shortform_list( cursor->offset = 0; } if (XFS_IS_CORRUPT(context->dp->i_mount, - !xfs_attr_namecheck(sbp->name, - sbp->namelen))) { + !xfs_attr_namecheck(mp, sbp->name, + sbp->namelen, + sbp->flags))) { error = -EFSCORRUPTED; goto out; } @@ -465,7 +471,8 @@ xfs_attr3_leaf_list_int( } if (XFS_IS_CORRUPT(context->dp->i_mount, - !xfs_attr_namecheck(name, namelen))) + !xfs_attr_namecheck(mp, name, namelen, + entry->flags))) return -EFSCORRUPTED; context->put_listent(context, entry->flags, name, namelen, valuelen); From patchwork Mon Nov 7 09:01:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allison Henderson X-Patchwork-Id: 13034133 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 48F45C4332F for ; Mon, 7 Nov 2022 09:03:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231360AbiKGJDN (ORCPT ); Mon, 7 Nov 2022 04:03:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33574 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231297AbiKGJDL (ORCPT ); Mon, 7 Nov 2022 04:03:11 -0500 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1FF2415FC0 for ; Mon, 7 Nov 2022 01:03:10 -0800 (PST) Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 2A77ixDj023182 for ; Mon, 7 Nov 2022 09:03:09 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=6tYSEWWb1wiKYWw2+XP6sFmWvJlNNBn4jDtZsPv6VNo=; b=vLJ0zBt+Xjm6sJ5ieh/vgok8dC7Swylv79kt0fFTELA0siY1Te1XuHF0DtJTgubL6ppH XGlMJvI2czoA8r6Ok7JFFKdP9u+vlNoQeISP1tP9fXSocmD80nZN9fTDwXG7ZaxOYvKw G4Nwt//pYmDe6gWrmCyS2e/MSkxJyQJidEEmRN1EnrchIFieihLZBZ8zdN8Mer22y67i OboirHvT7caIXsWpHBW5JYpQO10SW8EVxzYgrlEZCYJ0cMn7Sc+bdtyKYfBoMhQhb7Cl nKI43FZ2Tvyq/8DFsYKuwaz5i9O3eN/CqFBgs7old3HuWvHMDrivEiDzzqBTvbh5qg1S RQ== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3kngkw339u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:09 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2A77g2Yg024401 for ; Mon, 7 Nov 2022 09:03:08 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1anam02lp2044.outbound.protection.outlook.com [104.47.57.44]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3kpcsc2yp4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:08 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OcxJyzvvmM5ysKohgw+2OR3DrnhBrsbCBZgcLA122dqgZrAfJ584DwoUMd0jVHV8LZjwF7nzXUXEso/ShTuLD2r3LSnnQWb+8t92JgxObrcqsygRqL8+cwoHW4YtTCZpz/mO6l/KjYavGw9ikzodH5An5p2p2dGl19Ry0nxNiycWKYCV9IKOBS8VgwcWhOkdUywK3x7Ss/CjdX8FKtPrVCPzvGFh9fN5hPDFXCI5m7uIkIrkzsIHnemI9ORL/+e2P7P22irqK4Lj26QrOiuTEgaaKLk9tuPQQVh+JjTBrtpBLeJKKmA61JycpsJDDAgjGOJlWnQ9FGnoEjtb/+ZbQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=6tYSEWWb1wiKYWw2+XP6sFmWvJlNNBn4jDtZsPv6VNo=; b=M9JBp9dSFUgibqE9gjBL9aoAvYzPzpb3V92IZ8ag1dCRj9AR/phB4eoj61SiOfMESy9FC7qJ8Up1rhpCwYV364bC/JSRvQc0UmruNVfxOWCekHqgkK/sge3+m4CekxNyhC5nrKjToGO3qJwOTwLcYaN3lBoHgZX4qHIL8xVyzS3JgYQ1jOB20q9J0ce0XdQdkBrkNnoLqczhyGdI/3ObbZz0glM9AYcsMMF2MavCS0XCz5NZihse+DocfMRrFfFDeRMMyUzIZ9JgZZGP0rg0tgBAD5ykLQPUnO0lUoAWxW1CqpqzLAhiBk2x5SmelibjxAqM30kVSzlGo7A3eX4EQA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6tYSEWWb1wiKYWw2+XP6sFmWvJlNNBn4jDtZsPv6VNo=; b=k3yjh9OGO6O7HyZIa+QHfosvv2k1nLOmvZFKJsVDhYlzmcViXQpyi1R8pncxR1FcQLJbt5wxHMbkjf/tlT3XOWasCOIgVoDEBnBGRCEeffIuE/2S8NfiVz7dB5YYKvkIlfzNqiU1JD7FbDe6zj3J7OnqXG6v4U7vOShYkAB7+MA= Received: from BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) by PH0PR10MB5848.namprd10.prod.outlook.com (2603:10b6:510:149::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Mon, 7 Nov 2022 09:03:06 +0000 Received: from BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3]) by BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3%4]) with mapi id 15.20.5791.026; Mon, 7 Nov 2022 09:03:06 +0000 From: allison.henderson@oracle.com To: linux-xfs@vger.kernel.org Subject: [PATCH v5 13/26] xfs: extend transaction reservations for parent attributes Date: Mon, 7 Nov 2022 02:01:43 -0700 Message-Id: <20221107090156.299319-14-allison.henderson@oracle.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221107090156.299319-1-allison.henderson@oracle.com> References: <20221107090156.299319-1-allison.henderson@oracle.com> X-ClientProxiedBy: BYAPR11CA0049.namprd11.prod.outlook.com (2603:10b6:a03:80::26) To BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB4306:EE_|PH0PR10MB5848:EE_ X-MS-Office365-Filtering-Correlation-Id: e2752f5e-299d-4660-b226-08dac09ee248 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UkulG3a7v3X6gew3VXjuGRndr085DRycjlt+spw9cSoiZYSRH0622kSqdO7X+7zmdPBZGZqUtzv27O0tGMm8BM4pfn+O/T49FyvxFERatcSHa3nKoAqy4bQ/KuBgV242rWoMN0y0KY9K1BF0jsVdK0v/6WXYtjLTe7Szi84k6H/5QEqYTgqIthq4o/xVhMpjKa32rg9p4KVqkew6JmkwL/luCj+lmV860NCB0egJZQiZzWjiOlseuKWgumRJPg2e92y0Rs3z2rY2VR7/5ewDtmNqu6oVFxVBPMV1las7W8evmZmvznVxw50uJ+/ZPRMRSaY61u5ues74pEPO5+Ojv/XKy/+S5DZhlBoojkC4PqUmE2OV7E6dW4HZq0moAO9YtzwW73qU7Qsgmr+GDuxuxR3ooJbeRm/JEK3bFrmQNd2uCDTWO7bm1mhbkXHTS7C20A+fMwo55tHBSm+ikgE/IJL+SMEFNVRao+MvCzwXRC1U37WIznvs0cghGkmHw4Ns+vczrwYQWaWecZppbyHN7O4xgPc0PRhtbb8JvckijxW1bjjD/Si/z07QKduwvL2Y0dMBHJvkAIO2+Bt64n25qUSaltur+IWEHmhfkhAHQuzNqYN6k/0P3h+i2l5PWdbpysw6XvY+2B8astk3GfFkC8SjxkJd7SSwjyiZV4SRJvD+KVu8qcjcPdnx2SuIkcQhXi8AZKv2w7WCAp3PXgWEmw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB4306.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(396003)(39860400002)(136003)(346002)(366004)(376002)(451199015)(36756003)(8676002)(66946007)(6916009)(66556008)(66476007)(83380400001)(2906002)(6486002)(41300700001)(5660300002)(8936002)(478600001)(6512007)(2616005)(186003)(1076003)(26005)(30864003)(316002)(38100700002)(6666004)(86362001)(9686003)(6506007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AHhimvT+lIITPSmpILUP8bA3uXccgkHmlcFYT5a+PmgbcJQmiuF/7gtL5LuWnSBC9dKTARffSyu5ng49hzgChoagDlPIHyEYSMSA8NKKthM1n5ZJP5leRKnaWornVSov5MkEH+4WZRx/IS9PwZfKVFJ3zL+r3xbvuwNfc9MtKbadoQXQ73OnM3KlwY4gMzyOJlO1trT2Qp4wcTagU+GyA8/qpDrve+Gn0YYmpfba1h8OPfYugXrQnxwHcu3cUuKmvdY2aPISEh5Am0Rgt66I0PtMZGP3N2roz0IL34K0fPnte0B38gIfd3vDPevIvvXYkXj89zVtCw8sLGM0ERhHPrxZ7fa4fRvUsFqnL61Ququ5EYgil7CPvJjNbzmkdbM4DkZgmBkFcS50eSKHolCAWp5J75rFR3Xqc783ExtI6sTFtGa78I0YRlcG3DpA9WI+BH6nnw8JS2rzytWBz0GFEn1v0x/fHbW5lyoplQzDJoPBWIUzvVOGAgxWd0Uu+Y2svjpe5Znrp7k2sCfIj8ZC6d278SsmzeoNldfIlx98iUcmAAP/Mqh5VTue6ovub9LdbhmuazPevYHYFMO9kNaPeKgoEunWwG5coi5qmpWqTYetlET3j8AudfFhWFDuObDk01xE8K37aG8rYclD2nm1MgpA7X9A0NLTlhbTGRmXJpD/wRnOByyOHNNRv0M8A35f2t6r0iy+cXGON0RJzhQI3O0+kFtb/QnrSBpB9FErKHXhD03A8MfxSesmFLv0n0nKK11ql/ChJimLLmxkYjXt/lJENt256KL6D9YSVd+Lbg5rLXmgErGlw71tyHpW+UTWGQ6uYKGkjgZI1QS9AZ25Jt9BQNk9j7yLYjhuFYZa05hNcg+AO8df7vXcdb2o03c3dFBqmT2qhID4LuevZ9JCiVD1bdKWgjYI93owRmz39bmwGj19DkT/7WkfGrTBSwrzOArNw2jH1At8Mfr1jxJPz7qggYkjN3z3xTa7Bo+9L3KrGWTdw/4V5pxE9U5bR65mFPTT5zGErfotDYeExiXHNbbhKreS4mJNTXXzKlHQIjQLG5xbwUJoM9JmXiKp60/2cVW6kdR+9GPWv4AjAuX2dLDGVwnWeq6Ztw27WlNaidHOxhLEjt/bKe4jBv7MUEANXJ2Eua2M2G0Dk9ZSL+bBB27IHkdKQGe7wR8oq2N0j6/RpSHK3XOOrAhkEpkXfMV+Un9ixs+eW4FC/AOJbUgpjknYtXjud5BpspwmcJLPCb49HLz93J9c0zVnwLSneMb7iWzeu5OVvWgIZGcWKyalb6Fs8g/bSRmAOffV+Dmb+hY4qAkDHkdUhJ5hJhKZBeWlrhKVp/r3asYcwrLI22DbTWUj+XDT8511z1ZDfTNQD4QvxNsy+yTBo+jVeCeC6mKA2MkNWn2lm3uMzitEdY6ukgJ81w/qScgggR7VpW9RjP2rcZt0DDL9bfGY6EfLOne+ggRdaU1Of8YrmUCFhKoP8+idFr4/W0XQ95H0pmoP0TtsiOdtwWvyTFZheIFv2EU+LgO6nHw30TtQchufB/klhIXlVv/8MKGNr8WEuht4G2qf5bbH6BxN0C7zqW13MWhhViL5N7BHjLDQNNSKRPxmSA== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: e2752f5e-299d-4660-b226-08dac09ee248 X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4306.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2022 09:03:06.1064 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: axNpjTpGGwYGEIuN/Q2hlhAo9KV6InraiYCPpDWI8ec1cWAXcqIKOvZwExHI8xpwAHwa6R05gTTnecJ+uig3a5BLWaoccteNnk2GXem+Nyg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5848 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-07_02,2022-11-03_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxscore=0 spamscore=0 adultscore=0 malwarescore=0 mlxlogscore=999 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2211070076 X-Proofpoint-GUID: _bkSFGr0kX04pCVGeUYi1eIPCEtztNno X-Proofpoint-ORIG-GUID: _bkSFGr0kX04pCVGeUYi1eIPCEtztNno Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Allison Henderson We need to add, remove or modify parent pointer attributes during create/link/unlink/rename operations atomically with the dirents in the parent directories being modified. This means they need to be modified in the same transaction as the parent directories, and so we need to add the required space for the attribute modifications to the transaction reservations. Signed-off-by: Dave Chinner Signed-off-by: Allison Henderson --- fs/xfs/libxfs/xfs_trans_resv.c | 324 +++++++++++++++++++++++++++------ 1 file changed, 272 insertions(+), 52 deletions(-) diff --git a/fs/xfs/libxfs/xfs_trans_resv.c b/fs/xfs/libxfs/xfs_trans_resv.c index 5b2f27cbdb80..93419956b9e5 100644 --- a/fs/xfs/libxfs/xfs_trans_resv.c +++ b/fs/xfs/libxfs/xfs_trans_resv.c @@ -19,6 +19,9 @@ #include "xfs_trans.h" #include "xfs_qm.h" #include "xfs_trans_space.h" +#include "xfs_attr_item.h" +#include "xfs_log.h" +#include "xfs_da_format.h" #define _ALLOC true #define _FREE false @@ -420,29 +423,108 @@ xfs_calc_itruncate_reservation_minlogsize( return xfs_calc_itruncate_reservation(mp, true); } +static inline unsigned int xfs_calc_pptr_link_overhead(void) +{ + return sizeof(struct xfs_attri_log_format) + + xlog_calc_iovec_len(XATTR_NAME_MAX) + + xlog_calc_iovec_len(sizeof(struct xfs_parent_name_rec)); +} +static inline unsigned int xfs_calc_pptr_unlink_overhead(void) +{ + return sizeof(struct xfs_attri_log_format) + + xlog_calc_iovec_len(sizeof(struct xfs_parent_name_rec)); +} +static inline unsigned int xfs_calc_pptr_replace_overhead(void) +{ + return sizeof(struct xfs_attri_log_format) + + xlog_calc_iovec_len(XATTR_NAME_MAX) + + xlog_calc_iovec_len(XATTR_NAME_MAX) + + xlog_calc_iovec_len(sizeof(struct xfs_parent_name_rec)); +} + /* * In renaming a files we can modify: * the five inodes involved: 5 * inode size * the two directory btrees: 2 * (max depth + v2) * dir block size * the two directory bmap btrees: 2 * max depth * block size * And the bmap_finish transaction can free dir and bmap blocks (two sets - * of bmap blocks) giving: + * of bmap blocks) giving (t2): * the agf for the ags in which the blocks live: 3 * sector size * the agfl for the ags in which the blocks live: 3 * sector size * the superblock for the free block count: sector size * the allocation btrees: 3 exts * 2 trees * (2 * max depth - 1) * block size + * If parent pointers are enabled (t3), then each transaction in the chain + * must be capable of setting or removing the extended attribute + * containing the parent information. It must also be able to handle + * the three xattr intent items that track the progress of the parent + * pointer update. */ STATIC uint xfs_calc_rename_reservation( struct xfs_mount *mp) { - return XFS_DQUOT_LOGRES(mp) + - max((xfs_calc_inode_res(mp, 5) + - xfs_calc_buf_res(2 * XFS_DIROP_LOG_COUNT(mp), - XFS_FSB_TO_B(mp, 1))), - (xfs_calc_buf_res(7, mp->m_sb.sb_sectsize) + - xfs_calc_buf_res(xfs_allocfree_block_count(mp, 3), - XFS_FSB_TO_B(mp, 1)))); + unsigned int overhead = XFS_DQUOT_LOGRES(mp); + struct xfs_trans_resv *resp = M_RES(mp); + unsigned int t1, t2, t3 = 0; + + t1 = xfs_calc_inode_res(mp, 5) + + xfs_calc_buf_res(2 * XFS_DIROP_LOG_COUNT(mp), + XFS_FSB_TO_B(mp, 1)); + + t2 = xfs_calc_buf_res(7, mp->m_sb.sb_sectsize) + + xfs_calc_buf_res(xfs_allocfree_block_count(mp, 3), + XFS_FSB_TO_B(mp, 1)); + + if (xfs_has_parent(mp)) { + unsigned int rename_overhead, exchange_overhead; + + t3 = max(resp->tr_attrsetm.tr_logres, + resp->tr_attrrm.tr_logres); + + /* + * For a standard rename, the three xattr intent log items + * are (1) replacing the pptr for the source file; (2) + * removing the pptr on the dest file; and (3) adding a + * pptr for the whiteout file in the src dir. + * + * For an RENAME_EXCHANGE, there are two xattr intent + * items to replace the pptr for both src and dest + * files. Link counts don't change and there is no + * whiteout. + * + * In the worst case we can end up relogging all log + * intent items to allow the log tail to move ahead, so + * they become overhead added to each transaction in a + * processing chain. + */ + rename_overhead = xfs_calc_pptr_replace_overhead() + + xfs_calc_pptr_unlink_overhead() + + xfs_calc_pptr_link_overhead(); + exchange_overhead = 2 * xfs_calc_pptr_replace_overhead(); + + overhead += max(rename_overhead, exchange_overhead); + } + + return overhead + max3(t1, t2, t3); +} + +static inline unsigned int +xfs_rename_log_count( + struct xfs_mount *mp, + struct xfs_trans_resv *resp) +{ + /* One for the rename, one more for freeing blocks */ + unsigned int ret = XFS_RENAME_LOG_COUNT; + + /* + * Pre-reserve enough log reservation to handle the transaction + * rolling needed to remove or add one parent pointer. + */ + if (xfs_has_parent(mp)) + ret += max(resp->tr_attrsetm.tr_logcount, + resp->tr_attrrm.tr_logcount); + + return ret; } /* @@ -459,6 +541,23 @@ xfs_calc_iunlink_remove_reservation( 2 * M_IGEO(mp)->inode_cluster_size; } +static inline unsigned int +xfs_link_log_count( + struct xfs_mount *mp, + struct xfs_trans_resv *resp) +{ + unsigned int ret = XFS_LINK_LOG_COUNT; + + /* + * Pre-reserve enough log reservation to handle the transaction + * rolling needed to add one parent pointer. + */ + if (xfs_has_parent(mp)) + ret += resp->tr_attrsetm.tr_logcount; + + return ret; +} + /* * For creating a link to an inode: * the parent directory inode: inode size @@ -475,14 +574,23 @@ STATIC uint xfs_calc_link_reservation( struct xfs_mount *mp) { - return XFS_DQUOT_LOGRES(mp) + - xfs_calc_iunlink_remove_reservation(mp) + - max((xfs_calc_inode_res(mp, 2) + - xfs_calc_buf_res(XFS_DIROP_LOG_COUNT(mp), - XFS_FSB_TO_B(mp, 1))), - (xfs_calc_buf_res(3, mp->m_sb.sb_sectsize) + - xfs_calc_buf_res(xfs_allocfree_block_count(mp, 1), - XFS_FSB_TO_B(mp, 1)))); + unsigned int overhead = XFS_DQUOT_LOGRES(mp); + struct xfs_trans_resv *resp = M_RES(mp); + unsigned int t1, t2, t3 = 0; + + overhead += xfs_calc_iunlink_remove_reservation(mp); + t1 = xfs_calc_inode_res(mp, 2) + + xfs_calc_buf_res(XFS_DIROP_LOG_COUNT(mp), XFS_FSB_TO_B(mp, 1)); + t2 = xfs_calc_buf_res(3, mp->m_sb.sb_sectsize) + + xfs_calc_buf_res(xfs_allocfree_block_count(mp, 1), + XFS_FSB_TO_B(mp, 1)); + + if (xfs_has_parent(mp)) { + t3 = resp->tr_attrsetm.tr_logres; + overhead += xfs_calc_pptr_link_overhead(); + } + + return overhead + max3(t1, t2, t3); } /* @@ -497,6 +605,23 @@ xfs_calc_iunlink_add_reservation(xfs_mount_t *mp) M_IGEO(mp)->inode_cluster_size; } +static inline unsigned int +xfs_remove_log_count( + struct xfs_mount *mp, + struct xfs_trans_resv *resp) +{ + unsigned int ret = XFS_REMOVE_LOG_COUNT; + + /* + * Pre-reserve enough log reservation to handle the transaction + * rolling needed to add one parent pointer. + */ + if (xfs_has_parent(mp)) + ret += resp->tr_attrrm.tr_logcount; + + return ret; +} + /* * For removing a directory entry we can modify: * the parent directory inode: inode size @@ -513,14 +638,24 @@ STATIC uint xfs_calc_remove_reservation( struct xfs_mount *mp) { - return XFS_DQUOT_LOGRES(mp) + - xfs_calc_iunlink_add_reservation(mp) + - max((xfs_calc_inode_res(mp, 2) + - xfs_calc_buf_res(XFS_DIROP_LOG_COUNT(mp), - XFS_FSB_TO_B(mp, 1))), - (xfs_calc_buf_res(4, mp->m_sb.sb_sectsize) + - xfs_calc_buf_res(xfs_allocfree_block_count(mp, 2), - XFS_FSB_TO_B(mp, 1)))); + unsigned int overhead = XFS_DQUOT_LOGRES(mp); + struct xfs_trans_resv *resp = M_RES(mp); + unsigned int t1, t2, t3 = 0; + + overhead += xfs_calc_iunlink_add_reservation(mp); + + t1 = xfs_calc_inode_res(mp, 2) + + xfs_calc_buf_res(XFS_DIROP_LOG_COUNT(mp), XFS_FSB_TO_B(mp, 1)); + t2 = xfs_calc_buf_res(4, mp->m_sb.sb_sectsize) + + xfs_calc_buf_res(xfs_allocfree_block_count(mp, 2), + XFS_FSB_TO_B(mp, 1)); + + if (xfs_has_parent(mp)) { + t3 = resp->tr_attrrm.tr_logres; + overhead += xfs_calc_pptr_unlink_overhead(); + } + + return overhead + max3(t1, t2, t3); } /* @@ -569,12 +704,40 @@ xfs_calc_icreate_resv_alloc( xfs_calc_finobt_res(mp); } +static inline unsigned int +xfs_icreate_log_count( + struct xfs_mount *mp, + struct xfs_trans_resv *resp) +{ + unsigned int ret = XFS_CREATE_LOG_COUNT; + + /* + * Pre-reserve enough log reservation to handle the transaction + * rolling needed to add one parent pointer. + */ + if (xfs_has_parent(mp)) + ret += resp->tr_attrsetm.tr_logcount; + + return ret; +} + STATIC uint -xfs_calc_icreate_reservation(xfs_mount_t *mp) +xfs_calc_icreate_reservation( + struct xfs_mount *mp) { - return XFS_DQUOT_LOGRES(mp) + - max(xfs_calc_icreate_resv_alloc(mp), - xfs_calc_create_resv_modify(mp)); + struct xfs_trans_resv *resp = M_RES(mp); + unsigned int overhead = XFS_DQUOT_LOGRES(mp); + unsigned int t1, t2, t3 = 0; + + t1 = xfs_calc_icreate_resv_alloc(mp); + t2 = xfs_calc_create_resv_modify(mp); + + if (xfs_has_parent(mp)) { + t3 = resp->tr_attrsetm.tr_logres; + overhead += xfs_calc_pptr_link_overhead(); + } + + return overhead + max3(t1, t2, t3); } STATIC uint @@ -587,6 +750,23 @@ xfs_calc_create_tmpfile_reservation( return res + xfs_calc_iunlink_add_reservation(mp); } +static inline unsigned int +xfs_mkdir_log_count( + struct xfs_mount *mp, + struct xfs_trans_resv *resp) +{ + unsigned int ret = XFS_MKDIR_LOG_COUNT; + + /* + * Pre-reserve enough log reservation to handle the transaction + * rolling needed to add one parent pointer. + */ + if (xfs_has_parent(mp)) + ret += resp->tr_attrsetm.tr_logcount; + + return ret; +} + /* * Making a new directory is the same as creating a new file. */ @@ -597,6 +777,22 @@ xfs_calc_mkdir_reservation( return xfs_calc_icreate_reservation(mp); } +static inline unsigned int +xfs_symlink_log_count( + struct xfs_mount *mp, + struct xfs_trans_resv *resp) +{ + unsigned int ret = XFS_SYMLINK_LOG_COUNT; + + /* + * Pre-reserve enough log reservation to handle the transaction + * rolling needed to add one parent pointer. + */ + if (xfs_has_parent(mp)) + ret += resp->tr_attrsetm.tr_logcount; + + return ret; +} /* * Making a new symplink is the same as creating a new file, but @@ -909,54 +1105,76 @@ xfs_calc_sb_reservation( return xfs_calc_buf_res(1, mp->m_sb.sb_sectsize); } -void -xfs_trans_resv_calc( +/* + * Namespace reservations. + * + * These get tricky when parent pointers are enabled as we have attribute + * modifications occurring from within these transactions. Rather than confuse + * each of these reservation calculations with the conditional attribute + * reservations, add them here in a clear and concise manner. This requires that + * the attribute reservations have already been calculated. + * + * Note that we only include the static attribute reservation here; the runtime + * reservation will have to be modified by the size of the attributes being + * added/removed/modified. See the comments on the attribute reservation + * calculations for more details. + */ +STATIC void +xfs_calc_namespace_reservations( struct xfs_mount *mp, struct xfs_trans_resv *resp) { - int logcount_adj = 0; - - /* - * The following transactions are logged in physical format and - * require a permanent reservation on space. - */ - resp->tr_write.tr_logres = xfs_calc_write_reservation(mp, false); - resp->tr_write.tr_logcount = XFS_WRITE_LOG_COUNT; - resp->tr_write.tr_logflags |= XFS_TRANS_PERM_LOG_RES; - - resp->tr_itruncate.tr_logres = xfs_calc_itruncate_reservation(mp, false); - resp->tr_itruncate.tr_logcount = XFS_ITRUNCATE_LOG_COUNT; - resp->tr_itruncate.tr_logflags |= XFS_TRANS_PERM_LOG_RES; + ASSERT(resp->tr_attrsetm.tr_logres > 0); resp->tr_rename.tr_logres = xfs_calc_rename_reservation(mp); - resp->tr_rename.tr_logcount = XFS_RENAME_LOG_COUNT; + resp->tr_rename.tr_logcount = xfs_rename_log_count(mp, resp); resp->tr_rename.tr_logflags |= XFS_TRANS_PERM_LOG_RES; resp->tr_link.tr_logres = xfs_calc_link_reservation(mp); - resp->tr_link.tr_logcount = XFS_LINK_LOG_COUNT; + resp->tr_link.tr_logcount = xfs_link_log_count(mp, resp); resp->tr_link.tr_logflags |= XFS_TRANS_PERM_LOG_RES; resp->tr_remove.tr_logres = xfs_calc_remove_reservation(mp); - resp->tr_remove.tr_logcount = XFS_REMOVE_LOG_COUNT; + resp->tr_remove.tr_logcount = xfs_remove_log_count(mp, resp); resp->tr_remove.tr_logflags |= XFS_TRANS_PERM_LOG_RES; resp->tr_symlink.tr_logres = xfs_calc_symlink_reservation(mp); - resp->tr_symlink.tr_logcount = XFS_SYMLINK_LOG_COUNT; + resp->tr_symlink.tr_logcount = xfs_symlink_log_count(mp, resp); resp->tr_symlink.tr_logflags |= XFS_TRANS_PERM_LOG_RES; resp->tr_create.tr_logres = xfs_calc_icreate_reservation(mp); - resp->tr_create.tr_logcount = XFS_CREATE_LOG_COUNT; + resp->tr_create.tr_logcount = xfs_icreate_log_count(mp, resp); resp->tr_create.tr_logflags |= XFS_TRANS_PERM_LOG_RES; + resp->tr_mkdir.tr_logres = xfs_calc_mkdir_reservation(mp); + resp->tr_mkdir.tr_logcount = xfs_mkdir_log_count(mp, resp); + resp->tr_mkdir.tr_logflags |= XFS_TRANS_PERM_LOG_RES; +} + +void +xfs_trans_resv_calc( + struct xfs_mount *mp, + struct xfs_trans_resv *resp) +{ + int logcount_adj = 0; + + /* + * The following transactions are logged in physical format and + * require a permanent reservation on space. + */ + resp->tr_write.tr_logres = xfs_calc_write_reservation(mp, false); + resp->tr_write.tr_logcount = XFS_WRITE_LOG_COUNT; + resp->tr_write.tr_logflags |= XFS_TRANS_PERM_LOG_RES; + + resp->tr_itruncate.tr_logres = xfs_calc_itruncate_reservation(mp, false); + resp->tr_itruncate.tr_logcount = XFS_ITRUNCATE_LOG_COUNT; + resp->tr_itruncate.tr_logflags |= XFS_TRANS_PERM_LOG_RES; + resp->tr_create_tmpfile.tr_logres = xfs_calc_create_tmpfile_reservation(mp); resp->tr_create_tmpfile.tr_logcount = XFS_CREATE_TMPFILE_LOG_COUNT; resp->tr_create_tmpfile.tr_logflags |= XFS_TRANS_PERM_LOG_RES; - resp->tr_mkdir.tr_logres = xfs_calc_mkdir_reservation(mp); - resp->tr_mkdir.tr_logcount = XFS_MKDIR_LOG_COUNT; - resp->tr_mkdir.tr_logflags |= XFS_TRANS_PERM_LOG_RES; - resp->tr_ifree.tr_logres = xfs_calc_ifree_reservation(mp); resp->tr_ifree.tr_logcount = XFS_INACTIVE_LOG_COUNT; resp->tr_ifree.tr_logflags |= XFS_TRANS_PERM_LOG_RES; @@ -986,6 +1204,8 @@ xfs_trans_resv_calc( resp->tr_qm_dqalloc.tr_logcount = XFS_WRITE_LOG_COUNT; resp->tr_qm_dqalloc.tr_logflags |= XFS_TRANS_PERM_LOG_RES; + xfs_calc_namespace_reservations(mp, resp); + /* * The following transactions are logged in logical format with * a default log count. From patchwork Mon Nov 7 09:01:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allison Henderson X-Patchwork-Id: 13034135 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 91CE8C4332F for ; Mon, 7 Nov 2022 09:03:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230516AbiKGJDP (ORCPT ); Mon, 7 Nov 2022 04:03:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231338AbiKGJDN (ORCPT ); Mon, 7 Nov 2022 04:03:13 -0500 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A96AD1659A for ; Mon, 7 Nov 2022 01:03:11 -0800 (PST) Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 2A75U5rq015656 for ; Mon, 7 Nov 2022 09:03:11 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=emG4/FDtdxjOFCvM2+MStfC0/QV7EuaCJpmwP7TZA6g=; b=SoLwFGbEAOZZ9YMBXE1xEV7jrzO2O9ASF2eAcNdCIPQ8+iOeFZShFcemmVZ9ybV+tgdP s7BZ4MeVLhQoi3AszzSFamrZf2kA6TEeBCWwEr/J2Qb6LL6BLIKgBRKioqfz4ot4HayH 15+wcLKdQjaKwLZMAuT49MnE5Es1oGLUvRb4dqgFkxoeVPU6UN7+lRp+Vv+9+FpThxQ3 o+zojWHpInGrdouphkNsAYk7vMauRhHAoFvIpdjbptkBY/pGXtgD17XJvJEh2rhloszz ehe3T+DX3vRpdny+MOlS+/dSrnOqagy1X5QIz1TNpeKoUoy2a40/KshzIgQD/q4B7tzT bA== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3kngkw339w-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:10 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2A77atQ6001448 for ; Mon, 7 Nov 2022 09:03:09 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1anam02lp2045.outbound.protection.outlook.com [104.47.57.45]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3kpcq0jm01-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:09 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=K0wZ72WHuZ+MsbTOONaqmVvzJGSee4spqVppjJRKpTeyb0mnRUf1PwgkhxV+sQCkHJ9qveCGaFYkXpBvwjxn8MVfgh/PXri6IpfjwcI99E8gZ4TV470j/aESIdgITxnmTv1dbDpxIiHpU/XbVyukZepTCdLsZPE0jwwE8u/4fv+pjarUjaDhuNpAU6jblEp28Udnm40yTnKC9PdpIwg7ln6Uxn9dHiiDfx3HWy1iPpyFEleWCidGIlo38pYAW2vpzLBs06tZadzBSv1+PyTjmWSqStBAZnqZakA7aNg/FhyDG7q5X9SZ0bQaZO9hoMPrTw9LnEVLC1Z6uMzeHPqYSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=emG4/FDtdxjOFCvM2+MStfC0/QV7EuaCJpmwP7TZA6g=; b=Rl49TESRQ2BBW7ubpoowJJtErbt2jClWtiVOAJmHU5l0pe+T6XLE471GSOee8TtmOc1f6GVxi29e/PVv7avUcZ2lWZ0eygMx5g+n3Nbx4pIGULhvffdGbzIf0WkiYa2Q6ONnPBVplWDhPhkxIDgwZJviH8QqHvx2U/XRY2HXnoeLnMNTn2rP82lePyj7DGvauzqg3JljFq5SMszZbKgtEToC2ujpdg+y7A5C3/VotptPRFDIyb7I+xwhAuueFeb4fVvgTB4LeZ3wPbPdpMGUYBX2vvMX9t9kknkn4YZnCxpmofOpODn0vbX5XLoIiptaqQ69iAt9zjk/K4A0xvzI7w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=emG4/FDtdxjOFCvM2+MStfC0/QV7EuaCJpmwP7TZA6g=; b=lYLolK7cFDwRYSNiKbbtnDC3+jvsnEQJhybyBZ39iqdCj/XIF7JazucwsgcSDHfIALGb0YQ7g5zpcM1C/t/JtscZW1JYx/hnPcYG49R/iM/SqWn6LOhllyhu6VUv8qdoFtEAkg3Bzmi7VcNoSPd3C3mRq26h+Ta2oOD9ySbch48= Received: from BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) by PH0PR10MB5848.namprd10.prod.outlook.com (2603:10b6:510:149::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Mon, 7 Nov 2022 09:03:07 +0000 Received: from BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3]) by BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3%4]) with mapi id 15.20.5791.026; Mon, 7 Nov 2022 09:03:07 +0000 From: allison.henderson@oracle.com To: linux-xfs@vger.kernel.org Subject: [PATCH v5 14/26] xfs: parent pointer attribute creation Date: Mon, 7 Nov 2022 02:01:44 -0700 Message-Id: <20221107090156.299319-15-allison.henderson@oracle.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221107090156.299319-1-allison.henderson@oracle.com> References: <20221107090156.299319-1-allison.henderson@oracle.com> X-ClientProxiedBy: SJ0PR13CA0104.namprd13.prod.outlook.com (2603:10b6:a03:2c5::19) To BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB4306:EE_|PH0PR10MB5848:EE_ X-MS-Office365-Filtering-Correlation-Id: d4044a72-f5dd-4f8e-e365-08dac09ee34c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ii58tyZychuap/xhdeGvWbuMdUo/C2uXO1LZe4aWMGq/+yohC+hqhvKn/ro7y0eraPq0M0lY7YWZwIZjkQ7P/KbKTLz1Odqu8iZh7DsJ2+mlhEfTnR/Dqi3qvlgfwK/Gh3InzY8j0YpBLR6HCgsuVlbdXFWjXjhuiYJKv5D8veb6p25BE9cex2z1bJT38vo+aPH64S+a6Wjg8iD+2JoZ5mrT7uuKpXrk4Ajf+wA48L40qc2fOsvGogIWWxhL/i7oTT34dENc986pHlVgpUU3g9+I53GST5nuZFzefJfLt6hlrnxq7ML7ei5w3+/+pzU3Ft8Ks2UqGaqolVzY9vuGZN6mMDDluZDKntXtJLeIkWmuoeOr624JRrJYTrF1HVRMm3aa5jR5SiVFOFc26CdChvAEB+k63GTV0z8XHXXVejDD6qbRCXPacgLFiNHe6fbtYGENbORg4HfiKiIjKovaIKhrswYFFDba694u3TrPdRDX+usQRdcXr6zFrZc/W9DS5HZc2bKd6A7cEjC6h5zCKNq0DBL9Mszqw7e4YI66/c8B8QTRjllnr9JlMI085T9OPkwKrEOrWldbC2p5tmujZAWOaqIndT4ofPK4H1V4pw8ph8Mip/A9oT7mHevPoIRx3dBYHioOqJ4rd8tIvSO5uC6JVvvzcx/XTXnEzcpF7wJF2L0TSJGBNVynKBbFbKEtzvohRv7I78/0NV452P20ow== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB4306.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(396003)(39860400002)(136003)(346002)(366004)(376002)(451199015)(36756003)(8676002)(66946007)(6916009)(66556008)(66476007)(83380400001)(2906002)(6486002)(41300700001)(5660300002)(8936002)(478600001)(6512007)(2616005)(186003)(1076003)(26005)(30864003)(316002)(38100700002)(6666004)(86362001)(9686003)(6506007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: a4CEJfYPBGebAjfaKNcgDIerPOGvlvIs2BDVUt795ejRG8XnxAu97rP9CRQvK+V4iwhgvd2CrgcI9SGVX6hoiVDk0dLF9hPQz626BgbymZ2zVu8XD6WYN48A9kjCqjTlkzj6xl64J+mNXecwCOorCG+a2Juou8lmM/rfhOXOtD0qGrWGP9TBBqHEtU0nQYTHoAG7w9AxaX81KuxKf/KbCEAfdm69x1WuYQgp7mUYVQasAslftt0g5Ts2PE5KHJzH9pDA5iPW9pFDKtiCAokE0k+BFdrZ1ChNzYvsEZnBc9yctwWwUcS0/cNvTb/OwYd3Mr19UkxnQV0lcqnDv2KkvAHv9cDc9T4V4rkd90MIM+7vyWKDButwy9R/ylQY5+X/nuyWIpvJrKszwVzQIMeiK7ID7TZpJ3Hfbdz7dyNBZtFNqxl/X9bRQf6LJOb71NBLUps6ecDh8KhYlqDobKGs0jtw6IezxXTf5PMvf61DGwEwbyq0h+vaBLly/FgTf16Sw+B5QszcuDvez3NiK4FYLVb79kAVRFm6xHY+OlMwVzRQ9eaR37sZODf4TtXXwDymPBDRnBNSKSvZoRKWL6znnvZb0YBQuhqkSTu7Dd7AUEk9JeCf87tiBznQGjwT4oGSVb+qEs/I2vBd9fMrRA85l2CS8/TXJ6Z5WKQvgQojsaikTaYKCYzaF3zH52TFebJLeDUITfqptZmt2H66gAIJj4TfaPSjsLkG52yVCK6wf8hBjp4qwDZ6hzf3B1HOZAB34Y2NRywj4c4iBHWA/klwm0HWjUKWB+AosS3KBS03bhSOoGLFuW7iMorgnercoSO7Wpp79RJ7KM0eA7oFp2ceqL+nhvzzyAU5lhHQFnYEYvdvjgqIIMCW55S8IYzPMGqniD3ZQcPgVkwtoCXV5ixEaLYXLwUBwsu1iJW1CxAMDXB/W38SSgu4E31AdDJ6wZmXm8TgcjwnQxcdc3zog8j7yvSsB9XUOUJVapy1bITlas8M45ugXTWsFA5h9fO+8aKBubutMGtmvYV9CUB1w4UblRH2876qStquN6NRbVeTybGFK3GTLjLGq0j3roI1SRz3vVdpcAAC9puVUtAU8imZInbxiPelVN0VF6u2fZgv/P9o6/hhCNUeVD80XMACPN405+Asjhazs+WWeGbOZ3AsaN2WTgkbAB5yya6LMliml7nzOKUOW3kjjvFDYBaAS4lt2vkL8KVCf3ZwJSH3x5tmkpYfVa6Sfv5C8DCQtbSEAtlWs2CKtSPINDrW87Z0lCt+rpacl3eev9Ewu8DfyGOA0znlneIHUBgA4XtDKSvMAnZTPdUf4dadbXPhRZRejGIGJnZMg4sA2ODQdeh0KoWB9YANbU7vC+BQamwmDwrlFAAYhLgI9O9TDVm84VIUCoY8Ox+O2sRl3wcMuKWtQRXQTD7jzn7E/vaEyYA3pUqkd+nmmtfqzSRuxqUUcbWFGQw1p8O+sWLulgaiweJ0OfyLpn0LnzsNpziezl53LC/IbJeV/2dMB433Rwm9ujDIcFdb6a8f3tmPpdIdXpqMsYI3dDWIXY4C+goIdwNvfpmOM/kcJIbkV1B8LpN6XalRKxCdH81irsF8sZAj7YEnKH2fRg== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: d4044a72-f5dd-4f8e-e365-08dac09ee34c X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4306.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2022 09:03:07.7960 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: qwYeTU3g8MRW5bRhx+3KqJ74n3exmxZivlFX+MBNQI0CaLcw4sQGrK8gRNFrFxyiFL56hFaOD8DN2qnGwVgH2W3qlxHZNwstJ8nYiB/jfkU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5848 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-07_02,2022-11-03_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 spamscore=0 adultscore=0 malwarescore=0 mlxlogscore=999 mlxscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2211070076 X-Proofpoint-GUID: 46Wbyqj2tu-33LVU-5Og3VT02IvYnxuV X-Proofpoint-ORIG-GUID: 46Wbyqj2tu-33LVU-5Og3VT02IvYnxuV Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Allison Henderson Add parent pointer attribute during xfs_create, and subroutines to initialize attributes Signed-off-by: Dave Chinner Signed-off-by: Allison Henderson --- fs/xfs/Makefile | 1 + fs/xfs/libxfs/xfs_attr.c | 4 +- fs/xfs/libxfs/xfs_attr.h | 4 +- fs/xfs/libxfs/xfs_parent.c | 149 +++++++++++++++++++++++++++++++++++++ fs/xfs/libxfs/xfs_parent.h | 34 +++++++++ fs/xfs/xfs_inode.c | 63 ++++++++++++++-- fs/xfs/xfs_xattr.c | 2 +- fs/xfs/xfs_xattr.h | 1 + 8 files changed, 247 insertions(+), 11 deletions(-) diff --git a/fs/xfs/Makefile b/fs/xfs/Makefile index 03135a1c31b6..e2b2cf50ffcf 100644 --- a/fs/xfs/Makefile +++ b/fs/xfs/Makefile @@ -40,6 +40,7 @@ xfs-y += $(addprefix libxfs/, \ xfs_inode_fork.o \ xfs_inode_buf.o \ xfs_log_rlimit.o \ + xfs_parent.o \ xfs_ag_resv.o \ xfs_rmap.o \ xfs_rmap_btree.o \ diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c index 711022742e34..f68d41f0f998 100644 --- a/fs/xfs/libxfs/xfs_attr.c +++ b/fs/xfs/libxfs/xfs_attr.c @@ -886,7 +886,7 @@ xfs_attr_lookup( return error; } -static int +int xfs_attr_intent_init( struct xfs_da_args *args, unsigned int op_flags, /* op flag (set or remove) */ @@ -904,7 +904,7 @@ xfs_attr_intent_init( } /* Sets an attribute for an inode as a deferred operation */ -static int +int xfs_attr_defer_add( struct xfs_da_args *args) { diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h index b79dae788cfb..0cf23f5117ad 100644 --- a/fs/xfs/libxfs/xfs_attr.h +++ b/fs/xfs/libxfs/xfs_attr.h @@ -544,6 +544,7 @@ int xfs_inode_hasattr(struct xfs_inode *ip); bool xfs_attr_is_leaf(struct xfs_inode *ip); int xfs_attr_get_ilocked(struct xfs_da_args *args); int xfs_attr_get(struct xfs_da_args *args); +int xfs_attr_defer_add(struct xfs_da_args *args); int xfs_attr_set(struct xfs_da_args *args); int xfs_attr_set_iter(struct xfs_attr_intent *attr); int xfs_attr_remove_iter(struct xfs_attr_intent *attr); @@ -552,7 +553,8 @@ bool xfs_attr_namecheck(struct xfs_mount *mp, const void *name, size_t length, int xfs_attr_calc_size(struct xfs_da_args *args, int *local); void xfs_init_attr_trans(struct xfs_da_args *args, struct xfs_trans_res *tres, unsigned int *total); - +int xfs_attr_intent_init(struct xfs_da_args *args, unsigned int op_flags, + struct xfs_attr_intent **attr); /* * Check to see if the attr should be upgraded from non-existent or shortform to * single-leaf-block attribute list. diff --git a/fs/xfs/libxfs/xfs_parent.c b/fs/xfs/libxfs/xfs_parent.c new file mode 100644 index 000000000000..cf5ea8ce8bd3 --- /dev/null +++ b/fs/xfs/libxfs/xfs_parent.c @@ -0,0 +1,149 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2022 Oracle, Inc. + * All rights reserved. + */ +#include "xfs.h" +#include "xfs_fs.h" +#include "xfs_format.h" +#include "xfs_da_format.h" +#include "xfs_log_format.h" +#include "xfs_shared.h" +#include "xfs_trans_resv.h" +#include "xfs_mount.h" +#include "xfs_bmap_btree.h" +#include "xfs_inode.h" +#include "xfs_error.h" +#include "xfs_trace.h" +#include "xfs_trans.h" +#include "xfs_da_btree.h" +#include "xfs_attr.h" +#include "xfs_da_btree.h" +#include "xfs_attr_sf.h" +#include "xfs_bmap.h" +#include "xfs_defer.h" +#include "xfs_log.h" +#include "xfs_xattr.h" +#include "xfs_parent.h" +#include "xfs_trans_space.h" + +/* + * Parent pointer attribute handling. + * + * Because the attribute value is a filename component, it will never be longer + * than 255 bytes. This means the attribute will always be a local format + * attribute as it is xfs_attr_leaf_entsize_local_max() for v5 filesystems will + * always be larger than this (max is 75% of block size). + * + * Creating a new parent attribute will always create a new attribute - there + * should never, ever be an existing attribute in the tree for a new inode. + * ENOSPC behavior is problematic - creating the inode without the parent + * pointer is effectively a corruption, so we allow parent attribute creation + * to dip into the reserve block pool to avoid unexpected ENOSPC errors from + * occurring. + */ + + +/* Initializes a xfs_parent_name_rec to be stored as an attribute name */ +void +xfs_init_parent_name_rec( + struct xfs_parent_name_rec *rec, + struct xfs_inode *ip, + uint32_t p_diroffset) +{ + xfs_ino_t p_ino = ip->i_ino; + uint32_t p_gen = VFS_I(ip)->i_generation; + + rec->p_ino = cpu_to_be64(p_ino); + rec->p_gen = cpu_to_be32(p_gen); + rec->p_diroffset = cpu_to_be32(p_diroffset); +} + +/* Initializes a xfs_parent_name_irec from an xfs_parent_name_rec */ +void +xfs_init_parent_name_irec( + struct xfs_parent_name_irec *irec, + struct xfs_parent_name_rec *rec) +{ + irec->p_ino = be64_to_cpu(rec->p_ino); + irec->p_gen = be32_to_cpu(rec->p_gen); + irec->p_diroffset = be32_to_cpu(rec->p_diroffset); +} + +int +xfs_parent_init( + struct xfs_mount *mp, + struct xfs_parent_defer **parentp) +{ + struct xfs_parent_defer *parent; + int error; + + if (!xfs_has_parent(mp)) + return 0; + + error = xfs_attr_grab_log_assist(mp); + if (error) + return error; + + parent = kzalloc(sizeof(*parent), GFP_KERNEL); + if (!parent) + return -ENOMEM; + + /* init parent da_args */ + parent->args.geo = mp->m_attr_geo; + parent->args.whichfork = XFS_ATTR_FORK; + parent->args.attr_filter = XFS_ATTR_PARENT; + parent->args.op_flags = XFS_DA_OP_OKNOENT | XFS_DA_OP_LOGGED; + parent->args.name = (const uint8_t *)&parent->rec; + parent->args.namelen = sizeof(struct xfs_parent_name_rec); + + *parentp = parent; + return 0; +} + +int +xfs_parent_defer_add( + struct xfs_trans *tp, + struct xfs_parent_defer *parent, + struct xfs_inode *dp, + struct xfs_name *parent_name, + xfs_dir2_dataptr_t diroffset, + struct xfs_inode *child) +{ + struct xfs_da_args *args = &parent->args; + + xfs_init_parent_name_rec(&parent->rec, dp, diroffset); + args->hashval = xfs_da_hashname(args->name, args->namelen); + + args->trans = tp; + args->dp = child; + if (parent_name) { + parent->args.value = (void *)parent_name->name; + parent->args.valuelen = parent_name->len; + } + + return xfs_attr_defer_add(args); +} + +void +xfs_parent_cancel( + xfs_mount_t *mp, + struct xfs_parent_defer *parent) +{ + xlog_drop_incompat_feat(mp->m_log); + kfree(parent); +} + +unsigned int +xfs_pptr_calc_space_res( + struct xfs_mount *mp, + unsigned int namelen) +{ + /* + * Pptrs are always the first attr in an attr tree, and never larger + * than a block + */ + return XFS_DAENTER_SPACE_RES(mp, XFS_ATTR_FORK) + + XFS_NEXTENTADD_SPACE_RES(mp, namelen, XFS_ATTR_FORK); +} + diff --git a/fs/xfs/libxfs/xfs_parent.h b/fs/xfs/libxfs/xfs_parent.h new file mode 100644 index 000000000000..9b8d0764aad6 --- /dev/null +++ b/fs/xfs/libxfs/xfs_parent.h @@ -0,0 +1,34 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2022 Oracle, Inc. + * All Rights Reserved. + */ +#ifndef __XFS_PARENT_H__ +#define __XFS_PARENT_H__ + +/* + * Dynamically allocd structure used to wrap the needed data to pass around + * the defer ops machinery + */ +struct xfs_parent_defer { + struct xfs_parent_name_rec rec; + struct xfs_da_args args; +}; + +/* + * Parent pointer attribute prototypes + */ +void xfs_init_parent_name_rec(struct xfs_parent_name_rec *rec, + struct xfs_inode *ip, + uint32_t p_diroffset); +void xfs_init_parent_name_irec(struct xfs_parent_name_irec *irec, + struct xfs_parent_name_rec *rec); +int xfs_parent_init(xfs_mount_t *mp, struct xfs_parent_defer **parentp); +int xfs_parent_defer_add(struct xfs_trans *tp, struct xfs_parent_defer *parent, + struct xfs_inode *dp, struct xfs_name *parent_name, + xfs_dir2_dataptr_t diroffset, struct xfs_inode *child); +void xfs_parent_cancel(xfs_mount_t *mp, struct xfs_parent_defer *parent); +unsigned int xfs_pptr_calc_space_res(struct xfs_mount *mp, + unsigned int namelen); + +#endif /* __XFS_PARENT_H__ */ diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index ea7aeab839c2..ae6604f51ce8 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -37,6 +37,8 @@ #include "xfs_reflink.h" #include "xfs_ag.h" #include "xfs_log_priv.h" +#include "xfs_parent.h" +#include "xfs_xattr.h" struct kmem_cache *xfs_inode_cache; @@ -946,10 +948,32 @@ xfs_bumplink( xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); } +unsigned int +xfs_create_space_res( + struct xfs_mount *mp, + unsigned int namelen) +{ + unsigned int ret; + + ret = XFS_IALLOC_SPACE_RES(mp) + XFS_DIRENTER_SPACE_RES(mp, namelen); + if (xfs_has_parent(mp)) + ret += xfs_pptr_calc_space_res(mp, namelen); + + return ret; +} + +unsigned int +xfs_mkdir_space_res( + struct xfs_mount *mp, + unsigned int namelen) +{ + return xfs_create_space_res(mp, namelen); +} + int xfs_create( struct user_namespace *mnt_userns, - xfs_inode_t *dp, + struct xfs_inode *dp, struct xfs_name *name, umode_t mode, dev_t rdev, @@ -961,7 +985,7 @@ xfs_create( struct xfs_inode *ip = NULL; struct xfs_trans *tp = NULL; int error; - bool unlock_dp_on_error = false; + bool unlock_dp_on_error = false; prid_t prid; struct xfs_dquot *udqp = NULL; struct xfs_dquot *gdqp = NULL; @@ -969,6 +993,8 @@ xfs_create( struct xfs_trans_res *tres; uint resblks; xfs_ino_t ino; + xfs_dir2_dataptr_t diroffset; + struct xfs_parent_defer *parent = NULL; trace_xfs_create(dp, name); @@ -988,13 +1014,19 @@ xfs_create( return error; if (is_dir) { - resblks = XFS_MKDIR_SPACE_RES(mp, name->len); + resblks = xfs_mkdir_space_res(mp, name->len); tres = &M_RES(mp)->tr_mkdir; } else { - resblks = XFS_CREATE_SPACE_RES(mp, name->len); + resblks = xfs_create_space_res(mp, name->len); tres = &M_RES(mp)->tr_create; } + if (xfs_has_parent(mp)) { + error = xfs_parent_init(mp, &parent); + if (error) + goto out_release_dquots; + } + /* * Initially assume that the file does not exist and * reserve the resources for that case. If that is not @@ -1010,7 +1042,7 @@ xfs_create( resblks, &tp); } if (error) - goto out_release_dquots; + goto drop_incompat; xfs_ilock(dp, XFS_ILOCK_EXCL | XFS_ILOCK_PARENT); unlock_dp_on_error = true; @@ -1020,6 +1052,7 @@ xfs_create( * entry pointing to them, but a directory also the "." entry * pointing to itself. */ + init_xattrs = init_xattrs || xfs_has_parent(mp); error = xfs_dialloc(&tp, dp->i_ino, mode, &ino); if (!error) error = xfs_init_new_inode(mnt_userns, tp, dp, ino, mode, @@ -1034,11 +1067,12 @@ xfs_create( * the transaction cancel unlocking dp so don't do it explicitly in the * error path. */ - xfs_trans_ijoin(tp, dp, XFS_ILOCK_EXCL); + xfs_trans_ijoin(tp, dp, 0); unlock_dp_on_error = false; error = xfs_dir_createname(tp, dp, name, ip->i_ino, - resblks - XFS_IALLOC_SPACE_RES(mp), NULL); + resblks - XFS_IALLOC_SPACE_RES(mp), + &diroffset); if (error) { ASSERT(error != -ENOSPC); goto out_trans_cancel; @@ -1054,6 +1088,17 @@ xfs_create( xfs_bumplink(tp, dp); } + /* + * If we have parent pointers, we need to add the attribute containing + * the parent information now. + */ + if (parent) { + error = xfs_parent_defer_add(tp, parent, dp, name, diroffset, + ip); + if (error) + goto out_trans_cancel; + } + /* * If this is a synchronous mount, make sure that the * create transaction goes to disk before returning to @@ -1079,6 +1124,7 @@ xfs_create( *ipp = ip; xfs_iunlock(ip, XFS_ILOCK_EXCL); + xfs_iunlock(dp, XFS_ILOCK_EXCL | XFS_ILOCK_PARENT); return 0; out_trans_cancel: @@ -1093,6 +1139,9 @@ xfs_create( xfs_finish_inode_setup(ip); xfs_irele(ip); } + drop_incompat: + if (parent) + xfs_parent_cancel(mp, parent); out_release_dquots: xfs_qm_dqrele(udqp); xfs_qm_dqrele(gdqp); diff --git a/fs/xfs/xfs_xattr.c b/fs/xfs/xfs_xattr.c index c325a28b89a8..d9067c5f6bd6 100644 --- a/fs/xfs/xfs_xattr.c +++ b/fs/xfs/xfs_xattr.c @@ -27,7 +27,7 @@ * they must release the permission by calling xlog_drop_incompat_feat * when they're done. */ -static inline int +int xfs_attr_grab_log_assist( struct xfs_mount *mp) { diff --git a/fs/xfs/xfs_xattr.h b/fs/xfs/xfs_xattr.h index 2b09133b1b9b..3fd6520a4d69 100644 --- a/fs/xfs/xfs_xattr.h +++ b/fs/xfs/xfs_xattr.h @@ -7,6 +7,7 @@ #define __XFS_XATTR_H__ int xfs_attr_change(struct xfs_da_args *args); +int xfs_attr_grab_log_assist(struct xfs_mount *mp); extern const struct xattr_handler *xfs_xattr_handlers[]; From patchwork Mon Nov 7 09:01:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allison Henderson X-Patchwork-Id: 13034134 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A638C433FE for ; Mon, 7 Nov 2022 09:03:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231479AbiKGJDO (ORCPT ); Mon, 7 Nov 2022 04:03:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33574 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230516AbiKGJDM (ORCPT ); Mon, 7 Nov 2022 04:03:12 -0500 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 16DF51659D for ; Mon, 7 Nov 2022 01:03:12 -0800 (PST) Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 2A764BZt018998 for ; Mon, 7 Nov 2022 09:03:11 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=mHRCUwxjd+KrpG2o7Ku7PbS+w2hzlVYb0cOL/Drjq6w=; b=pSayD/Qr0Vvnm7CObmdnSO9VPp2SipE/fuGFrOkFRbAyDKRLPBZhcdHp0cRiZFkb85hp css881UGVhwITUmKaS9K10eHYCT3taSSB4PN6sinrCDnPyXR3rYqBw7+KOfQkHarKHi+ M/iJCb44RbZzGj7ZoE1PMdgb9DAgtOAtm+7jv2xWyEBskQqfk6cEYiY8LOBB2qN9gZ0k TV4DzcqeNtMYSpUkecEJQdmGxc51YSgvE9XCvdNAm4LhopMom6AknylJoKfjwKexagmY UdrlL8ZuvHnjkvhySLlXW8BwP+8FlQsUO4RKYyoHnLHML6FqDLr6KtJ9lla6HGwc9S2M vA== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3kngmj30jg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:11 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2A77atQ7001448 for ; Mon, 7 Nov 2022 09:03:10 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1anam02lp2045.outbound.protection.outlook.com [104.47.57.45]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3kpcq0jm01-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:10 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IMLe3sh5ST6UgTKYg3/ACi2395clqijr0PFljth2opTcw5Ci0MtIptNZXgeREzvU+Uww+NOHrx3RJ197dqzslqhIQmQqm03OnQj22sqiqNW0CzrHIsUh6PoSVcz+KnyIN7/GE+C//Wb+pwJT3JyMW7emWnCIav+TlebP3tkqgH09jyUWmS6wXO88vNJRB6hB+LfsvHIhZgJ8eBKwDg5lYZND1JA7mJef2DXxOBcMBHt17iMCzon7DboC7jX8lErIOgreYi/QqvgoNfgmi5YiMWKgZ1rxShnvFzsQZziE1GVCbmPcQfKMbmpA+Bt7ce60/Uu6oodQ1LmlHmGkzkDPSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=mHRCUwxjd+KrpG2o7Ku7PbS+w2hzlVYb0cOL/Drjq6w=; b=h8FtJrhP+FdOzMHo2xGFojBfnd1hiekDaZGUe6gVTln72IXIbD1cN+B2qja66mxWjgfNvRA9Z/FKAPmyrQzskLtD/KuZCefkJhVQxO7aJ/WNgq//hb3EVgyL0J0GAhbUPd3gmadZae1ApTjBaj4if/MpBGXo88BmesZfT12C2Yis1UHdo92b/nqU8o04lVfcjxSfrLzV/3Q7Tl0fHnhG7cEuz72ezBL9k6tYcoDIlNjZiupXGRGLXVUaTEsu9qaX2uQuntA9J89yFzFRQJ7MP5ck0xue0ktst0sbHu9lauZluv1t/riPF0zgHWVFk5cgCYos7ALSgfhxSMjpawHwpw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mHRCUwxjd+KrpG2o7Ku7PbS+w2hzlVYb0cOL/Drjq6w=; b=YeFDNyXVr3qQdByciImh3s8laPuem4MrMh/lv2UmOy56wo4m1GSBTgeommWcbAYkzXeAwMO64ASGMIG5F7flCs53QJzXe0ByFwdGv/7pvBAH2/fUKKpO/Usf/Zjeg06V4OIcFWx5+4dDNZXUL6rJqlLr5TjiEuVgi8WG07BBaBo= Received: from BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) by PH0PR10MB5848.namprd10.prod.outlook.com (2603:10b6:510:149::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Mon, 7 Nov 2022 09:03:08 +0000 Received: from BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3]) by BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3%4]) with mapi id 15.20.5791.026; Mon, 7 Nov 2022 09:03:08 +0000 From: allison.henderson@oracle.com To: linux-xfs@vger.kernel.org Subject: [PATCH v5 15/26] xfs: add parent attributes to link Date: Mon, 7 Nov 2022 02:01:45 -0700 Message-Id: <20221107090156.299319-16-allison.henderson@oracle.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221107090156.299319-1-allison.henderson@oracle.com> References: <20221107090156.299319-1-allison.henderson@oracle.com> X-ClientProxiedBy: SJ0PR13CA0110.namprd13.prod.outlook.com (2603:10b6:a03:2c5::25) To BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB4306:EE_|PH0PR10MB5848:EE_ X-MS-Office365-Filtering-Correlation-Id: bec2ce8b-8c42-4e1c-16cc-08dac09ee3ec X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: H+LQsyBOnauZGQHc8JPqbx/8QWkRQYtRuu+uo2p4UgBOzqR36uMlnFUk7kJv53zQT+EV+JupiDhJ29CUVbQOONly2ss0HjCCJNRj0WoW2mzaFJlv6hCmDwnCBwiE4BSozjDBrv5wCA9/fOMqg+Q887cdCuaJhGSc4RgnDmENi3jv6YECL0LQp6zkZnwjxcwOFHNHJ7gNCPajbGt+xXHBKoMx53af3IV7ZyacXZFsYrq3NocASvF7QPegxwRHppJxN02HDQlDYU5GCiXrRqqV89J2QTZ8a0myNhXOYYFf3rUxTuH+wTpJBx3gjGhErnN1cAEQc1f8Hz6A2LSnF+oUIcNVajw3yE8dywFSTnjlHoP0Ygz9lZEXisMc7tUqr0zN4dnMcLEeoH1gT/NlUbIUtTzJ+Ech6oRhQqoA+FMaJ2U2BplEiGhuyGs7gyqbyqLr9XJO1BPQEKJTxX5tJ4n0+5gIbGDqBLSO6dtZaKOD2u/SXazKni3PvuVO+qCK7BmbI92W0/oxeNBVnHKNXGyKWfOa2Kw6ZyHaCNccpUQ6nk1Uu09LYZOLgtSrL2puRwtQWuNQLhIcpYxiKZSZT2f+PN+Uru4iL5FCAsbRfOV8DjsMhfQ7cVPp2bodQ+L6QDj+9N8xJLkqByHWYBPg4HcttBKvlRUCx2m3kaIo/P52JlE5EdNZFvZW82mfGf8de4pE X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB4306.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(396003)(39860400002)(136003)(346002)(366004)(376002)(451199015)(36756003)(8676002)(66946007)(6916009)(66556008)(66476007)(83380400001)(2906002)(6486002)(41300700001)(5660300002)(8936002)(478600001)(6512007)(2616005)(186003)(1076003)(26005)(316002)(38100700002)(6666004)(86362001)(9686003)(6506007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: et+j/ouXn5PwHLcI+msAAgsCQjPfHkZcizWQGZbY0vb2Gvls8iB1lZpwn2R7Xa13dPXhpH1XI0lJrkDnjnZT0mGMLDnWHT/TEM8aOSkXXPSbvlXEehH3OpOTiF05bAxYPCizqGVS29MHkN8q6LfbJkciiSADgEm/t1Y5Odc8mHAiN+/1gxltPzo/KdtCigqyijxWmRpNFt/JgQEOBCX0ki8LJ5/PSiwLQ5dcgqMEgosT1vrh3pbQh/9FgoLcGiuavW/+lQq127eRgn+ROZG2DUZJYrQDeGOsDhebHpJXxRAI6r03suzMFU/tU/taUrJzfGE43U5bjKDEJ5AwFlbZm1d1PQp/zVFvuVtflBte5WRqoGhUrx3n1v8Gz2jKe5AV91m6uj654kY72IjcLDbC1u5YYCP6HFepljgrKwpziBCusPaJ+e1Z4pPR7m/aAO9sYLkwlPzC4mO7UBPwC0fNddAQNOJRaL0zKzag7SzOi5CmxwN13LpDZ7v3cyR5mDrKWnWsF96EYcskwNEwmm+yJ3aAmscks18R3PLehZZbeWQlDPo9Wnb2DVCjX1lewRHUUlBrNEl9l15dMpuaLVN3a/ZvhCxfvTzG1vs4FH2AZGf6SnWfiFyd7r4lbA3okv9h4w1A6snlfBfzCFWtpIwRymFiVJzS4Lk3uSvEofq7yMIEuURgAnHGUMZqRNCBiKnPRvMMGd49ieXj8OCzVnpgmWAEn3zkHlp/kRRtd+y+kHI0qRrAI0OmivsrcLVHhUF2L+yakRaAt7wK5HfYEG/qWJrWaOBRQ4jaS7uyTmirtP8PLfTOq4Dyvm9EMdTPmXnWdcaN3e5uOOYxl1T6AAvJf2/KiTnCCckcioX6SpIqIaEBJJD41+GeNhB79MX5ciQU+jUJf+VRYhApaFlUr054vNoT99caxgJR+ajRYIuXNPJbk1vLqFQjSm4ok1kAGzV4mfe/PrJ5xtskyicjiZqEIkIGz6gqnpHMnGlriq69NgdNIprkVTd2RjAzY2ODGcqQHfapOHVJXROJ9wRdcddzixARtlzN6MdY/bV286O7CCt47UwPotglKWjhp1ipCO7AB7GAYKj8buLbt21ShCegw25e8WyCDTx3uh6hNua1r3EOEt79/9G95z7cT5bL0TyMJRCfp8LU50aFOFpJIvVyadsxCys7gsvNEvMthWEbl9E1csoZhYHaoNewPKBD04Kq9DNqZdC9xtVADAZIVoer9JJrWq4U2bKQS//DnYwfXRH/8yNZ1s4EvlYlxQp4bOfEBLlSJ6uYfJXvPLbUlhpapZBACmDnUtgjmy/4JxvbzAS6Rvkxqc1F5WzMRWuyMVEvy/zF9/kPOmrF+g8aq9vx2Cg/ZYwHJm/NNb+Z4G4AZBSDOVRgkBN+KvzNh7sxGfjV1sxWjkWDDhf/E9PdZKx989Kcd3wwFTyMxgO08iEIOSN2cmm/o2qd5In6OYvj9gsYrtXdyTYUgROmwXxybwMmlq9WdMm4OHXd7wSx/7AmvVEouRRsbFYDodhk726tjujUSpLKTKBdME6aUgK1hlYpXheZS8agqHtgbNU3bwlb7CaWzy9lw21eW2QB45v0FcNJV55+v5r2RvuMmN6F1Y/xNg== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: bec2ce8b-8c42-4e1c-16cc-08dac09ee3ec X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4306.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2022 09:03:08.8082 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: mcVf0xU5w+ljblMcrvUfRjYWb3CQ7po6USyoCcBuNaydOmzIUEknJ7znl1r7X1EdNzROFqquxI+vNHFFIpmqHFVC6/s9DzjeF/ZfPTvXNEo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5848 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-07_02,2022-11-03_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 spamscore=0 adultscore=0 malwarescore=0 mlxlogscore=999 mlxscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2211070076 X-Proofpoint-GUID: 9ECprsP-hAQn-PivYiFYx03clxlp98ZP X-Proofpoint-ORIG-GUID: 9ECprsP-hAQn-PivYiFYx03clxlp98ZP Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Allison Henderson This patch modifies xfs_link to add a parent pointer to the inode. Signed-off-by: Dave Chinner Signed-off-by: Allison Henderson Reviewed-by: Darrick J. Wong --- fs/xfs/libxfs/xfs_trans_space.h | 2 -- fs/xfs/xfs_inode.c | 52 ++++++++++++++++++++++++++++----- 2 files changed, 45 insertions(+), 9 deletions(-) diff --git a/fs/xfs/libxfs/xfs_trans_space.h b/fs/xfs/libxfs/xfs_trans_space.h index 87b31c69a773..f72207923ec2 100644 --- a/fs/xfs/libxfs/xfs_trans_space.h +++ b/fs/xfs/libxfs/xfs_trans_space.h @@ -84,8 +84,6 @@ (2 * (mp)->m_alloc_maxlevels) #define XFS_GROWFSRT_SPACE_RES(mp,b) \ ((b) + XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK)) -#define XFS_LINK_SPACE_RES(mp,nl) \ - XFS_DIRENTER_SPACE_RES(mp,nl) #define XFS_MKDIR_SPACE_RES(mp,nl) \ (XFS_IALLOC_SPACE_RES(mp) + XFS_DIRENTER_SPACE_RES(mp,nl)) #define XFS_QM_DQALLOC_SPACE_RES(mp) \ diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index ae6604f51ce8..c780ab3a04d2 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -1248,16 +1248,32 @@ xfs_create_tmpfile( return error; } +unsigned int +xfs_link_space_res( + struct xfs_mount *mp, + unsigned int namelen) +{ + unsigned int ret; + + ret = XFS_DIRENTER_SPACE_RES(mp, namelen); + if (xfs_has_parent(mp)) + ret += xfs_pptr_calc_space_res(mp, namelen); + + return ret; +} + int xfs_link( - xfs_inode_t *tdp, - xfs_inode_t *sip, + struct xfs_inode *tdp, + struct xfs_inode *sip, struct xfs_name *target_name) { - xfs_mount_t *mp = tdp->i_mount; - xfs_trans_t *tp; + struct xfs_mount *mp = tdp->i_mount; + struct xfs_trans *tp; int error, nospace_error = 0; int resblks; + xfs_dir2_dataptr_t diroffset; + struct xfs_parent_defer *parent = NULL; trace_xfs_link(tdp, target_name); @@ -1274,11 +1290,17 @@ xfs_link( if (error) goto std_return; - resblks = XFS_LINK_SPACE_RES(mp, target_name->len); + if (xfs_has_parent(mp)) { + error = xfs_parent_init(mp, &parent); + if (error) + goto std_return; + } + + resblks = xfs_link_space_res(mp, target_name->len); error = xfs_trans_alloc_dir(tdp, &M_RES(mp)->tr_link, sip, &resblks, &tp, &nospace_error); if (error) - goto std_return; + goto drop_incompat; /* * If we are using project inheritance, we only allow hard link @@ -1311,7 +1333,7 @@ xfs_link( } error = xfs_dir_createname(tp, tdp, target_name, sip->i_ino, - resblks, NULL); + resblks, &diroffset); if (error) goto error_return; xfs_trans_ichgtime(tp, tdp, XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG); @@ -1319,6 +1341,19 @@ xfs_link( xfs_bumplink(tp, sip); + /* + * If we have parent pointers, we now need to add the parent record to + * the attribute fork of the inode. If this is the initial parent + * attribute, we need to create it correctly, otherwise we can just add + * the parent to the inode. + */ + if (parent) { + error = xfs_parent_defer_add(tp, parent, tdp, target_name, + diroffset, sip); + if (error) + goto error_return; + } + /* * If this is a synchronous mount, make sure that the * link transaction goes to disk before returning to @@ -1336,6 +1371,9 @@ xfs_link( xfs_trans_cancel(tp); xfs_iunlock(tdp, XFS_ILOCK_EXCL); xfs_iunlock(sip, XFS_ILOCK_EXCL); + drop_incompat: + if (parent) + xfs_parent_cancel(mp, parent); std_return: if (error == -ENOSPC && nospace_error) error = nospace_error; From patchwork Mon Nov 7 09:01:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allison Henderson X-Patchwork-Id: 13034136 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 54942C43217 for ; Mon, 7 Nov 2022 09:03:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231338AbiKGJDR (ORCPT ); Mon, 7 Nov 2022 04:03:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33638 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231348AbiKGJDO (ORCPT ); Mon, 7 Nov 2022 04:03:14 -0500 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 26333165A0 for ; Mon, 7 Nov 2022 01:03:13 -0800 (PST) Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 2A75Zv53025290 for ; Mon, 7 Nov 2022 09:03:12 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=+4RLOvLGs4IZo/DMVeMJDf+MwYo8LMgO6tdl9c4wy/M=; b=kZCvYiMoyoOZgt5ehWEHQj1geXWvZ2Uiqgm0wH7NTClmeYVAI6Mz+lcm0AXHCwB5iF7f vzS1EYNAF1Fts8GBirrlRdd6WDcIqSbsj7ZdlA4PVDImuMIk3gmyITzc+IQKxIB6c9Bm ZFIurr2EE2bbQJajr5YvhpAQhVgKVepLrLMJaOP4ziumuBw2ke/Xsoc0xvoC5O/siTo2 rxBK3n/QdVHzgdY76vvF1PoQ6ie0dIdyTkHn+5J+JMdBdV6Yf8XyqtUD1dLW5EwYTyGb aGMxKjspk66Ge6Ho4MAyCPxZ8EBpZ2M0rpsOJtlBdLRe2Oktf5RHDlBwDTbj75AJvvjO kg== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3kngmj30jj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:12 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2A77YwuQ023880 for ; Mon, 7 Nov 2022 09:03:11 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1anam02lp2047.outbound.protection.outlook.com [104.47.57.47]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3kpcsc2yqe-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:11 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bp/eQdQpcD9izRuPTTxJXdoZ0hWAEpds1WuVz8TOxSHW2hCZV2ilNGFrP3vBH7kf/hVAtK5KMKGaq6WQ37IUrJMdHl+LIODBJXa0t6H6NBfARYVskXUPMia2WkCF0JlpxMh6nmKUfwwJInt/JPUDJXXH+eI96TPkztOm6a2QCTWUCUTNhpqxuqmmguBZHU/3TyVTQKFNwENDXN95JX/aYwMNsDODlOx2cRuN2b0Jbm4VmzRldIlJiw4ivLOPJFWPTyj5NYWek7yq/An2NFjj7u6/49pOBj8fXCGjZYrKINO8D3d7evpSDC5eAgsCG12QqcC5c2wDPI5buWvRIPewXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+4RLOvLGs4IZo/DMVeMJDf+MwYo8LMgO6tdl9c4wy/M=; b=PQelbZVwm6Rg/TrJv/ukbpdVn5o6L3fvUj+vMnXvBoiy4tibDrGYkc84tMdsic41ln0J+mAFLFJkYwv4bRUjFi+GPNm004LSD1QOrc9A0vvszvJhlQOFFUkyVIKdrSfljaOXFVxx0EZ6os6VfYWQ5fufwIoBx125HDuw4v3jOfziVT0tRKswnzbqM3Zdq93ML1ZD51RSXCfm2V38KbqVyutVuzzvPLbAJ4aWIid6+dzq2kfsEvcKtoCeqOucTqYer+EfFySoue4sRyTJGuvw/SNkjsxfYkNXCw558QPyOYe5O6jHqV1JEgdzXD6CxXKp0l5DhTSWjEnmRIcLZv9QOQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+4RLOvLGs4IZo/DMVeMJDf+MwYo8LMgO6tdl9c4wy/M=; b=FaUV2CWQqeU/9FVvBXPE6A697BPaRjA6eXgv+OoKOOnvedqOqKjnb1s+u0MGG0RcyCkuTEvQUR2ih3G6AZXf/zKQFRB8ux+VgrNNSOGoz8N8l6AafY44C8NR7nq3ZHKVSoqzwSPrdknRZ9pqAAON0Sw5GXg0w0OC8D1hl2/QCdQ= Received: from BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) by PH0PR10MB5848.namprd10.prod.outlook.com (2603:10b6:510:149::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Mon, 7 Nov 2022 09:03:09 +0000 Received: from BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3]) by BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3%4]) with mapi id 15.20.5791.026; Mon, 7 Nov 2022 09:03:09 +0000 From: allison.henderson@oracle.com To: linux-xfs@vger.kernel.org Subject: [PATCH v5 16/26] xfs: add parent attributes to symlink Date: Mon, 7 Nov 2022 02:01:46 -0700 Message-Id: <20221107090156.299319-17-allison.henderson@oracle.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221107090156.299319-1-allison.henderson@oracle.com> References: <20221107090156.299319-1-allison.henderson@oracle.com> X-ClientProxiedBy: BYAPR02CA0003.namprd02.prod.outlook.com (2603:10b6:a02:ee::16) To BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB4306:EE_|PH0PR10MB5848:EE_ X-MS-Office365-Filtering-Correlation-Id: 756c8d96-b00c-43b2-f023-08dac09ee475 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GY8H9axotvzWZebeIhsAAJXjSTKbc7bjYEi3TgJdgeN/uyN50I1Pz/Wn1U0csKh4e0xgvcb36akzFR6dlVf2H/6pD/CHUezW0baPq1jRYP+9IjqsqzCYfbE0bXD1lnZ6WW7W4bTRIMnqGDLJ1oPu+Aqmdf/TC4Ad2jH6gDpE3buAKCITpM86IAa0PCtgVPsIsD5mjma3fC59tLARxoek7AKHhxakh0oJIssXw5uZDePIu52ONBMjc46xBX3pf00rBdGqtmcOrdO2Qwoj2BYY4zKpNWdnS3Ws4sypWMy+Nqi4Gd/qlOWaAwA/X5mqLkok1Hda3inrmmaZcB3I7wV351D1kFZ/Y/Ql/Rzi7Cqr/XFPaaW+H8ak7ub6AoXjsWXmj5a3Z1DVPz1MnKNySBKEhskQQvYGPK+0duBp2kDbTavl6KKJzxg7dWs1C2zBNSAEXesMAF28wW46LBSS8jn482v0KzoTpH7zSrELtut4y7p76d2EEGFn3/fFAIMluGnO5rMKuwFsTIyDuUNBA+2PEaN+89Gw2HjgHwDuPQtiHDhGeg69ToDHm0Qjp3Kg7yWdKPoHHv3NlsS7GavD83bmFIf8jU62sKa80GYdSgzMtFY2U07GY5wSomUf3c7A7q5ZGIhA+Bzn17IK4XFMc+ZoHqsexaI4fJgMO52uZVnUrqIXF3iCgd0245m5/rrfT7LlsIrNSXDTqGcqe3Cq7+xRMg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB4306.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(396003)(39860400002)(136003)(346002)(366004)(376002)(451199015)(36756003)(8676002)(66946007)(6916009)(66556008)(66476007)(83380400001)(2906002)(6486002)(41300700001)(5660300002)(8936002)(478600001)(6512007)(2616005)(186003)(1076003)(26005)(316002)(38100700002)(6666004)(86362001)(9686003)(6506007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: c8302TisygqDV1XhugNgbLE9Z2DHOcy9DCX9UzywortY8713sJ18DzdmADf/8BqkZmoOKwDWfN5B2NIWneXIAGn9YrVAB9yZyTWbOXo2iRA/kLrnCYPCyJOARx3YR3Dzz6TIofGTy31gAr+WC4k0FgsURAx0E7kRmgutcXbVgR2QDKhVgZn1kYeybp6mLe5W3y1EXXDK3cB45Ga5fEmfzdNyOlC1fg+kaXBwQZM4MIe2JOORhPf5Nhwbt3JBCoQNWkPUgqmtI1LfRUMDt/0cngTcrRSB62+DhwribDbBbRlpTYXbDN/5wjNEw4OtqgUfVl7ulq1HqbXeiUxuiEl9iwVMFuuWarawIJy96oTGFx7Ip01xPGydJgZrL2UxhjiRf9IbuPD1U5FWsKo0UI6kFmc1TDuzOQV8UU4x9f4Pd5sC/zf3fOg2wAwtxUWIeQmlcruKX5Up91BLNIyzB/m+n4FlTyMnWTsgPsHHmEIT7rGl8o13DCcP1j/fCPpA0fwEbNG+Ans4GRMdGbNMyW33Zu1ERBI0uuF1j5UqmJY4wyFba71t6Tf/uD6IQTn8i729de/a5PdL92uYazZCoVZlTnoNX16U9JbkJ97xOJ4Bt1lWfk7mv3oPfDBTIfIbBnEqz/uJPmtA9p7fP9B6t616iTJZ6ptLsO3FNQJ1oHW4hYDrwfhePrdD96xxLsTpf7ah1Nnrse392fkBd7eawyFuh3Elw/AybabDQH+JyqvSf4tW+mfM69foEQmrhjYIQdIv+KbjXQhQSAP3fGu2WxzFkmiNJTD2nPBHJqTASMCpm6kfuIBIFvVFCBzcQBmrzi616nsD3twdwKELZJB9Xj7bAR2AKS8zTFGsvioG4zQvP85BsDoLq0tT8vA93wuoDCC/fzTKmZNgLNt6UgaQ/mXRP/RnuQM7AZSP/WLUSMnNoQETDuMysQzUIj+5Lb7uJrXTD16F/JDLUppLHdLXKXxzqH1rAEZCo34M2xXbJqH2FJtoOTtH7JxOxw+iZcjFGeDkBa5uVW2SxkS6qDlZSNsS7eqBXuqv6vdIWLvfHupJbxGjn+hGf7YwUwWMXR5m+7xg5KGuReMiFHfJc9to6MrcDXAFi4uMrbHCGmIgM6DIPS9GJ44sx1gnztnVKJ6jW7Vy8oBX/ZzUlcF/4C5URKdn5CcWAazv36QahhUOYOxW3YFKcH0V2tu4HOMRFan5rMwo78rneaCGS+jc8GosUP0KSQgTtNOqvndGhAeVDVYkjU6d7TGLY+/+nLrBOfT85WZY0KWqIAfip5Td/R85iALNCXKRrVam9r22f2Q2E6k5pEAbjhb6lEl8Hq3AIb0oQTQ1fK6p8qUGeN2qgQqob6P6PND2fqa3+Pgo5zatJ+wdIUGlEiMmpcErSFlR/gB+gmYbZ/vd2PNiLYWEXzVsJp9fwr6k8OTKx7mjVQwvBrQ/VtxHvWoSv4fjD2KbYNCE9Jl/Pd7XHa+yXUuvzNe+pGy24AE08bcpQBXqwSOmVy02nz4C74W6vblt9VADAS1WrDn1EjtQ3lu/ZCnqGjvKd9MbVuZ9rnKln5yLg7oNLqL2+NzDBgy7EGr2MXfwDjrG+uO6epkT/2QGZAWsXEgoTzLjqA== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 756c8d96-b00c-43b2-f023-08dac09ee475 X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4306.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2022 09:03:09.7584 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 797EmwFfUnmoFq+WjLoZA9pJSHCqTNduGW1hKl68n+eoPxnmW6lCcxJ89kmhjFX3+389b4Sj/f8oNgyrROWufzEIajJ8YSudxJEFl4nDcQU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5848 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-07_02,2022-11-03_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxscore=0 spamscore=0 adultscore=0 malwarescore=0 mlxlogscore=999 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2211070076 X-Proofpoint-GUID: 5Se06hBWCShhIKPFz-LkcV0uV_0lmNMs X-Proofpoint-ORIG-GUID: 5Se06hBWCShhIKPFz-LkcV0uV_0lmNMs Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Allison Henderson This patch modifies xfs_symlink to add a parent pointer to the inode. Signed-off-by: Allison Henderson --- fs/xfs/libxfs/xfs_trans_space.h | 2 -- fs/xfs/xfs_symlink.c | 50 +++++++++++++++++++++++++++++---- 2 files changed, 45 insertions(+), 7 deletions(-) diff --git a/fs/xfs/libxfs/xfs_trans_space.h b/fs/xfs/libxfs/xfs_trans_space.h index f72207923ec2..25a55650baf4 100644 --- a/fs/xfs/libxfs/xfs_trans_space.h +++ b/fs/xfs/libxfs/xfs_trans_space.h @@ -95,8 +95,6 @@ XFS_DIRREMOVE_SPACE_RES(mp) #define XFS_RENAME_SPACE_RES(mp,nl) \ (XFS_DIRREMOVE_SPACE_RES(mp) + XFS_DIRENTER_SPACE_RES(mp,nl)) -#define XFS_SYMLINK_SPACE_RES(mp,nl,b) \ - (XFS_IALLOC_SPACE_RES(mp) + XFS_DIRENTER_SPACE_RES(mp,nl) + (b)) #define XFS_IFREE_SPACE_RES(mp) \ (xfs_has_finobt(mp) ? M_IGEO(mp)->inobt_maxlevels : 0) diff --git a/fs/xfs/xfs_symlink.c b/fs/xfs/xfs_symlink.c index 27a7d7c57015..cf7dbd1ca938 100644 --- a/fs/xfs/xfs_symlink.c +++ b/fs/xfs/xfs_symlink.c @@ -23,6 +23,8 @@ #include "xfs_trans.h" #include "xfs_ialloc.h" #include "xfs_error.h" +#include "xfs_parent.h" +#include "xfs_defer.h" /* ----- Kernel only functions below ----- */ int @@ -142,6 +144,23 @@ xfs_readlink( return error; } +unsigned int +xfs_symlink_space_res( + struct xfs_mount *mp, + unsigned int namelen, + unsigned int fsblocks) +{ + unsigned int ret; + + ret = XFS_IALLOC_SPACE_RES(mp) + XFS_DIRENTER_SPACE_RES(mp, namelen) + + fsblocks; + + if (xfs_has_parent(mp)) + ret += xfs_pptr_calc_space_res(mp, namelen); + + return ret; +} + int xfs_symlink( struct user_namespace *mnt_userns, @@ -172,6 +191,8 @@ xfs_symlink( struct xfs_dquot *pdqp = NULL; uint resblks; xfs_ino_t ino; + xfs_dir2_dataptr_t diroffset; + struct xfs_parent_defer *parent = NULL; *ipp = NULL; @@ -202,13 +223,21 @@ xfs_symlink( /* * The symlink will fit into the inode data fork? - * There can't be any attributes so we get the whole variable part. + * If there are no parent pointers, then there wont't be any attributes. + * So we get the whole variable part, and do not need to reserve extra + * blocks. Otherwise, we need to reserve the blocks. */ - if (pathlen <= XFS_LITINO(mp)) + if (pathlen <= XFS_LITINO(mp) && !xfs_has_parent(mp)) fs_blocks = 0; else fs_blocks = xfs_symlink_blocks(mp, pathlen); - resblks = XFS_SYMLINK_SPACE_RES(mp, link_name->len, fs_blocks); + resblks = xfs_symlink_space_res(mp, link_name->len, fs_blocks); + + if (xfs_has_parent(mp)) { + error = xfs_parent_init(mp, &parent); + if (error) + return error; + } error = xfs_trans_alloc_icreate(mp, &M_RES(mp)->tr_symlink, udqp, gdqp, pdqp, resblks, &tp); @@ -233,7 +262,7 @@ xfs_symlink( if (!error) error = xfs_init_new_inode(mnt_userns, tp, dp, ino, S_IFLNK | (mode & ~S_IFMT), 1, 0, prid, - false, &ip); + xfs_has_parent(mp), &ip); if (error) goto out_trans_cancel; @@ -315,12 +344,20 @@ xfs_symlink( * Create the directory entry for the symlink. */ error = xfs_dir_createname(tp, dp, link_name, - ip->i_ino, resblks, NULL); + ip->i_ino, resblks, &diroffset); if (error) goto out_trans_cancel; xfs_trans_ichgtime(tp, dp, XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG); xfs_trans_log_inode(tp, dp, XFS_ILOG_CORE); + if (parent) { + error = xfs_parent_defer_add(tp, parent, dp, link_name, + diroffset, ip); + if (error) + goto out_trans_cancel; + } + + /* * If this is a synchronous mount, make sure that the * symlink transaction goes to disk before returning to @@ -362,6 +399,9 @@ xfs_symlink( xfs_iunlock(dp, XFS_ILOCK_EXCL); if (ip) xfs_iunlock(ip, XFS_ILOCK_EXCL); + if (parent) + xfs_parent_cancel(mp, parent); + return error; } From patchwork Mon Nov 7 09:01:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allison Henderson X-Patchwork-Id: 13034137 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D391BC433FE for ; Mon, 7 Nov 2022 09:03:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231203AbiKGJDS (ORCPT ); Mon, 7 Nov 2022 04:03:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231462AbiKGJDO (ORCPT ); Mon, 7 Nov 2022 04:03:14 -0500 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E21D165A7 for ; Mon, 7 Nov 2022 01:03:13 -0800 (PST) Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 2A75fMHO025318 for ; Mon, 7 Nov 2022 09:03:12 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=18p/wFL7P2HHrU50Qg21bInT96l627BUEGohR8wqWyo=; b=izvRSHowgBVFyv1Q4QQca5dv0d9epd6IkN56nD/1SR/U23ISuKKgQcpFBv+trlHVt8X4 UTT1DC+LZRXL15iv4bgUBQRa054lJ1jprgvTnjMH8eYk/wZ6S1ycSZ4a3PEtrkpoZpbP QDp76si2gq4uB/d6AbItuPWznsWxvS/Jf2v8u7lAaXyYJzJGP5NRZt9jubI9yY03L7my YtmMQ60My4jUPxUH/CNTH+YGzLpB3UmWHCFXDEm/ViGSNVtUVRzvhvv/v87DFBI0eKYd k7PmZtPojKOTgI30GYW2GM03E1B3NeiCDZroYqnXGoMCWvDhUbMzXk9H7rBvoJMwCgiI Og== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3kngmj30jk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:12 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2A77YwuR023880 for ; Mon, 7 Nov 2022 09:03:11 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1anam02lp2047.outbound.protection.outlook.com [104.47.57.47]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3kpcsc2yqe-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:11 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Vt7yjAO7abmQEfhyJFKFmwnbgxLfnH+Emd6a10AkGAkupoPcaYs3R1fhJTsTrGDqjoeAEswlm5As1I6lh40aGAxTKhBJFbIPQqukOqbFM4r7XsPSJSCjkfiHkR610jVG5yNEl6StE8vyidPgefCzu4lh0eCs0NIzcjNnKBQVWBKOwS8LIO4iWel4HISIhkhzehYQGQZag5lTUXWJdlc6YhX6BLVW0y45rryzYmS3yP5l1ybVPc7VyhVIth7KP89v2qfwV+fUlDYr6onjiF2cZ/rXTSQeSwfFl0b+g4WsvnQ6DOPF+CgEabLZRAg6okMN+WPHMWM0mAYX0Q3NdQ9bYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=18p/wFL7P2HHrU50Qg21bInT96l627BUEGohR8wqWyo=; b=GFaZhQ3ptogNdK2Xm5bj5XUlfCuZYD88boq2RphM+pSnMuR5NTbyOaGDSDYJFPBMOUSCfWl3rJf+zldU7btSzQ9jvRjXEEQVjTDXxWRjhpT6VOqn06Q/7v/hl0sIyyJnpLgy34L124aK+EhT1dbldlJuvhDxS6t0sBi4mga3RYkiek4DwzK/LYKuS8EUwXycd3Y1yl8vw6p/stbMktZI1oBfF9IiElHEOoL3J/EhrJMsSIZgyO1uF4MmfzmfHS7axn6ySvoPCa/hzXRf+3w9KdmEp5fjnyi0PHRwy9Z8LhBmSKNWfQ1FQ0y/GXo4JrT8KOPDF7mp5Q4fJPprIfNVPQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=18p/wFL7P2HHrU50Qg21bInT96l627BUEGohR8wqWyo=; b=vlp/WGKDvoFG/teEsh6Clsx8/ZjiiqPA/eiTGApGk+000PcuckZ8AN0orcQc6OMyUGmxZY9X86SOjvDwQc4EMmRMZcOUfD3l+XWe0TFVe8BP7lb+BY6Opm/98yzs7czc1SAAZm2oj1nylj3Dl2IOlzBAObrWU2i/2Gp6Whwe26I= Received: from BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) by PH0PR10MB5848.namprd10.prod.outlook.com (2603:10b6:510:149::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Mon, 7 Nov 2022 09:03:10 +0000 Received: from BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3]) by BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3%4]) with mapi id 15.20.5791.026; Mon, 7 Nov 2022 09:03:10 +0000 From: allison.henderson@oracle.com To: linux-xfs@vger.kernel.org Subject: [PATCH v5 17/26] xfs: remove parent pointers in unlink Date: Mon, 7 Nov 2022 02:01:47 -0700 Message-Id: <20221107090156.299319-18-allison.henderson@oracle.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221107090156.299319-1-allison.henderson@oracle.com> References: <20221107090156.299319-1-allison.henderson@oracle.com> X-ClientProxiedBy: BYAPR05CA0073.namprd05.prod.outlook.com (2603:10b6:a03:e0::14) To BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB4306:EE_|PH0PR10MB5848:EE_ X-MS-Office365-Filtering-Correlation-Id: f1b51588-5863-4304-9681-08dac09ee502 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: N52nXdjMvWyn5kNRHTR54MDf5VPt1mhAOW0JM+nc+2TNeP+EsFHyxLNSHpx7scmhArmL5oQ5NygF2ZjGonXIG+EirVqCFDsdZ5cksJQGHUzBhRQdyFTpcAJ62c6icGdiwO8KQL79cT7AQO7b/dq0twM06eJ5KB6pMJapA5+yNqTwPNESyE/GuKXFf40oAHCtv0T8SO8zDvkAsE0CDWRadpzIptlczGFBRkFX6YrQ1kD9M6itEegWoMaDjyWs6ipoPnNzWKxMMsKHxe4zzWmZbmgFo1+Xo9Svm9UdDc+yH/XTyV73f9AODDn6vf94GamiOnOGuyM8bXNn1YYrjU9QWDJYbGdXqNv3+j/nkfg7qJrjkr2rMvDbTmwPQGtR91TLe+XXzm3VOcadQsOtKDG/lqAMydO+Th8phY9r/NbtXqONc5hwFtyROnn5D2xgwFUbXsuXcdcYNt2QOBoEnE3UHsjmTz4hG26ViYdj30FFlhxkkPwg6rwy6YRL6q1KRl1inRR+/QXzjV/EIFMuvsuxQv3+Akdcyq9lUxYZf02cxTjw4nuEdVKEOUlowaDNYm5J1JNOEnAZcdE+fX7dYbTiVja7b8oHowJXOj3b5PjB6D/sHpnPk2Sq+r3O7PFb3jbw4cfzPMDqG2xK+3Wrz92DtAU+/I0ukUHoVzoWy9knECS3JyJQmT6kqEhdtUEjTrcJBb1vaKTXbxJJG3Rx4Qd3ow== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB4306.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(396003)(39860400002)(136003)(346002)(366004)(376002)(451199015)(36756003)(8676002)(66946007)(6916009)(66556008)(66476007)(83380400001)(2906002)(6486002)(41300700001)(5660300002)(8936002)(478600001)(6512007)(2616005)(186003)(1076003)(26005)(316002)(38100700002)(6666004)(86362001)(9686003)(6506007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: eY9n3aOp8XPYUg4iqEgiHs9AAj4Gggaj9pma8nVZMu+ClWaYaOZMw+/Wgg6nL+s0ciUpTf3lrO+WKsj02cUQb4VbvW9bei1R8+lgDESWRPE+k8Nr9D4ZSUEFR5fpZEgeS5sws4XFCrf9xWFCZgMcpk5p5M0Xj1hIgVLkhVPEg+p9iz8E158C3zBCFjQbAceCYKeQooM+/ZnBd+mMxlb52Cv9YrcwuFD7/urC77fsmqIjCEYBjNtNkWa3WdEOjCth3pVJst0uUFM/k6fbxHxj1ekQ8ykQOdlxHfwrtNgjNu7iKGTNv2vhXKKWuorMx7sKJiwogN8oM98W1GJ9OcUZ3sJJB72ujyY5U/COiMsHgRBsDzoGL/U6VUrk2u2yBrie1YguRPlCIaaWjsieqBUKqSML8CWLL3rNxYbpfdfvwX/Tl1Axrl6/2z6utWSD7DEOM21JU3TxqeX+HZzoI+onPc/E/Y5nCU3TB3L3RQXrTabqBT6VLnPCO5zIDpDnssEf3yAVqBqllhAoaVaIg+YIMul//7V0HbrfpAnAbI2OLatbvOMZ9kZl6OP1ldaIFkeViU8EtY0O97IWC0gIR8C/kdB8fw8ZGPD+ilj8aHMO2VEm1d1k0rTr6bDwOpdCPJPuN/I0Kh8Vo2gJ0j9ELXHurasqJxoYHWFVsZVhsJFUKxT7Uv2xtgd/8SBjk6ZfSNOmmvIs1D43IFcnYzYQLvp9XcBaRwefl/PiZHizqT+AzeaPDLQHTeBbF6KW1wAyW3rEQhDBMzHB5FISZ8gEJb8LKh1xHsOAUs7vDa6oFLFSPhC2PkcFTdxfR1UG9rXJcXkNrpmzqC1d6Thfcs8CGjt6lULzsXEm/VaNHkbfk172aeR413sm/CXULfWNcQJif82SnaSlV9zsPv2VsOXhb+ezRemscik+65/KFobFv6IoNFOkETEl5eL8xwSlS5Nf0sCirJy5VwGEZIqYDEjTONuFj0tnUIgEwoybAyTlRKif02J4kAiBZavfeqQGiN+lXeNgZrwql0sWX4BVZjExi/lB+v7deZdtzXN+ZIFehiytLZ+E3HkC0QbZzxVfwAY0juVJjxjGWlKwrHrUWC1l6BCnZSRepXdhf3sZOhMnFCK5TIowT6GfbZb9h7oCrYvOn9aCKNT69tod4Dr81neSizYwOsVfxhYbraW3SZg/ChJTSJ1sarDJS2xTH6Jfy52Fu7wubltJ87Tgn9lw3fm37QEotAFuXnOdQO0SXpgKw/uLapJuutEQw2PhnGnwNDzp/X8EhO9nlOpo8cDiFPFej58MxEkmN0CmSPkxZZc3m9kjZVwjd1TmxuebOiAZ8Vh301cj2Ei4VCJ3x1z6BGb95AsjnDgdCyNIn+a7qrvcCbUl32ef3Xz5KW6I6B2PG3jMetb1OxmfDWgqq0F/1oZhzWiuI5HT1CgYFWRVaYLYcpOHmJdQHtzt8DRGkP9V7EMHziU5uHIu+MN6rq+TLO18zUvm011weYRkfa3+n6zMHNo39oM5WhhuCeprEWR9LGOprUnZnHglKYa1dIzXmRHwRpmUFwdum93Z5UvVmcdUvmuxRfSeyx8ogXDBLFy0CvrtsuP4H7NvvWtLLnUm8iDbtWyl3g== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: f1b51588-5863-4304-9681-08dac09ee502 X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4306.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2022 09:03:10.6645 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: vPjx5AVnqEXoUPZ5W/wPDskk+ZOXUdOyf87Ht8zQcJmwr0GDWcRkJbRxPYQA/bJ++HZvlSqYwfWswXdwqXtJDndIdrXDXuox313JVk+FH4E= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5848 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-07_02,2022-11-03_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxscore=0 spamscore=0 adultscore=0 malwarescore=0 mlxlogscore=999 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2211070076 X-Proofpoint-GUID: lpToxH-cc-V0XKkVytV4CnqB5UEhES5W X-Proofpoint-ORIG-GUID: lpToxH-cc-V0XKkVytV4CnqB5UEhES5W Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Allison Henderson This patch removes the parent pointer attribute during unlink Signed-off-by: Dave Chinner Signed-off-by: Allison Henderson Reviewed-by: Darrick J. Wong --- fs/xfs/libxfs/xfs_attr.c | 2 +- fs/xfs/libxfs/xfs_attr.h | 1 + fs/xfs/libxfs/xfs_parent.c | 17 +++++++++++++ fs/xfs/libxfs/xfs_parent.h | 4 +++ fs/xfs/libxfs/xfs_trans_space.h | 2 -- fs/xfs/xfs_inode.c | 44 +++++++++++++++++++++++++++------ 6 files changed, 60 insertions(+), 10 deletions(-) diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c index f68d41f0f998..a8db44728b11 100644 --- a/fs/xfs/libxfs/xfs_attr.c +++ b/fs/xfs/libxfs/xfs_attr.c @@ -946,7 +946,7 @@ xfs_attr_defer_replace( } /* Removes an attribute for an inode as a deferred operation */ -static int +int xfs_attr_defer_remove( struct xfs_da_args *args) { diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h index 0cf23f5117ad..033005542b9e 100644 --- a/fs/xfs/libxfs/xfs_attr.h +++ b/fs/xfs/libxfs/xfs_attr.h @@ -545,6 +545,7 @@ bool xfs_attr_is_leaf(struct xfs_inode *ip); int xfs_attr_get_ilocked(struct xfs_da_args *args); int xfs_attr_get(struct xfs_da_args *args); int xfs_attr_defer_add(struct xfs_da_args *args); +int xfs_attr_defer_remove(struct xfs_da_args *args); int xfs_attr_set(struct xfs_da_args *args); int xfs_attr_set_iter(struct xfs_attr_intent *attr); int xfs_attr_remove_iter(struct xfs_attr_intent *attr); diff --git a/fs/xfs/libxfs/xfs_parent.c b/fs/xfs/libxfs/xfs_parent.c index cf5ea8ce8bd3..c09f49b7c241 100644 --- a/fs/xfs/libxfs/xfs_parent.c +++ b/fs/xfs/libxfs/xfs_parent.c @@ -125,6 +125,23 @@ xfs_parent_defer_add( return xfs_attr_defer_add(args); } +int +xfs_parent_defer_remove( + struct xfs_trans *tp, + struct xfs_inode *dp, + struct xfs_parent_defer *parent, + xfs_dir2_dataptr_t diroffset, + struct xfs_inode *child) +{ + struct xfs_da_args *args = &parent->args; + + xfs_init_parent_name_rec(&parent->rec, dp, diroffset); + args->trans = tp; + args->dp = child; + args->hashval = xfs_da_hashname(args->name, args->namelen); + return xfs_attr_defer_remove(args); +} + void xfs_parent_cancel( xfs_mount_t *mp, diff --git a/fs/xfs/libxfs/xfs_parent.h b/fs/xfs/libxfs/xfs_parent.h index 9b8d0764aad6..1c506532c624 100644 --- a/fs/xfs/libxfs/xfs_parent.h +++ b/fs/xfs/libxfs/xfs_parent.h @@ -27,6 +27,10 @@ int xfs_parent_init(xfs_mount_t *mp, struct xfs_parent_defer **parentp); int xfs_parent_defer_add(struct xfs_trans *tp, struct xfs_parent_defer *parent, struct xfs_inode *dp, struct xfs_name *parent_name, xfs_dir2_dataptr_t diroffset, struct xfs_inode *child); +int xfs_parent_defer_remove(struct xfs_trans *tp, struct xfs_inode *dp, + struct xfs_parent_defer *parent, + xfs_dir2_dataptr_t diroffset, + struct xfs_inode *child); void xfs_parent_cancel(xfs_mount_t *mp, struct xfs_parent_defer *parent); unsigned int xfs_pptr_calc_space_res(struct xfs_mount *mp, unsigned int namelen); diff --git a/fs/xfs/libxfs/xfs_trans_space.h b/fs/xfs/libxfs/xfs_trans_space.h index 25a55650baf4..b5ab6701e7fb 100644 --- a/fs/xfs/libxfs/xfs_trans_space.h +++ b/fs/xfs/libxfs/xfs_trans_space.h @@ -91,8 +91,6 @@ XFS_DQUOT_CLUSTER_SIZE_FSB) #define XFS_QM_QINOCREATE_SPACE_RES(mp) \ XFS_IALLOC_SPACE_RES(mp) -#define XFS_REMOVE_SPACE_RES(mp) \ - XFS_DIRREMOVE_SPACE_RES(mp) #define XFS_RENAME_SPACE_RES(mp,nl) \ (XFS_DIRREMOVE_SPACE_RES(mp) + XFS_DIRENTER_SPACE_RES(mp,nl)) #define XFS_IFREE_SPACE_RES(mp) \ diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index c780ab3a04d2..f6be7779c9bc 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -2470,6 +2470,19 @@ xfs_iunpin_wait( __xfs_iunpin_wait(ip); } +unsigned int +xfs_remove_space_res( + struct xfs_mount *mp, + unsigned int namelen) +{ + unsigned int ret = XFS_DIRREMOVE_SPACE_RES(mp); + + if (xfs_has_parent(mp)) + ret += xfs_pptr_calc_space_res(mp, namelen); + + return ret; +} + /* * Removing an inode from the namespace involves removing the directory entry * and dropping the link count on the inode. Removing the directory entry can @@ -2499,16 +2512,18 @@ xfs_iunpin_wait( */ int xfs_remove( - xfs_inode_t *dp, + struct xfs_inode *dp, struct xfs_name *name, - xfs_inode_t *ip) + struct xfs_inode *ip) { - xfs_mount_t *mp = dp->i_mount; - xfs_trans_t *tp = NULL; + struct xfs_mount *mp = dp->i_mount; + struct xfs_trans *tp = NULL; int is_dir = S_ISDIR(VFS_I(ip)->i_mode); int dontcare; int error = 0; uint resblks; + xfs_dir2_dataptr_t dir_offset; + struct xfs_parent_defer *parent = NULL; trace_xfs_remove(dp, name); @@ -2523,6 +2538,12 @@ xfs_remove( if (error) goto std_return; + if (xfs_has_parent(mp)) { + error = xfs_parent_init(mp, &parent); + if (error) + goto std_return; + } + /* * We try to get the real space reservation first, allowing for * directory btree deletion(s) implying possible bmap insert(s). If we @@ -2534,12 +2555,12 @@ xfs_remove( * the directory code can handle a reservationless update and we don't * want to prevent a user from trying to free space by deleting things. */ - resblks = XFS_REMOVE_SPACE_RES(mp); + resblks = xfs_remove_space_res(mp, name->len); error = xfs_trans_alloc_dir(dp, &M_RES(mp)->tr_remove, ip, &resblks, &tp, &dontcare); if (error) { ASSERT(error != -ENOSPC); - goto std_return; + goto drop_incompat; } /* @@ -2593,12 +2614,18 @@ xfs_remove( if (error) goto out_trans_cancel; - error = xfs_dir_removename(tp, dp, name, ip->i_ino, resblks, NULL); + error = xfs_dir_removename(tp, dp, name, ip->i_ino, resblks, &dir_offset); if (error) { ASSERT(error != -ENOENT); goto out_trans_cancel; } + if (parent) { + error = xfs_parent_defer_remove(tp, dp, parent, dir_offset, ip); + if (error) + goto out_trans_cancel; + } + /* * If this is a synchronous mount, make sure that the * remove transaction goes to disk before returning to @@ -2623,6 +2650,9 @@ xfs_remove( out_unlock: xfs_iunlock(ip, XFS_ILOCK_EXCL); xfs_iunlock(dp, XFS_ILOCK_EXCL); + drop_incompat: + if (parent) + xfs_parent_cancel(mp, parent); std_return: return error; } From patchwork Mon Nov 7 09:01:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allison Henderson X-Patchwork-Id: 13034138 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 61A7FC4321E for ; Mon, 7 Nov 2022 09:03:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231432AbiKGJDT (ORCPT ); Mon, 7 Nov 2022 04:03:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231297AbiKGJDP (ORCPT ); Mon, 7 Nov 2022 04:03:15 -0500 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D5EF15FC0 for ; Mon, 7 Nov 2022 01:03:15 -0800 (PST) Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 2A78uato012294 for ; Mon, 7 Nov 2022 09:03:15 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=B2WfycBxt1J9clQm/24saA8kQkhQHjrLi/b6QVLuMGE=; b=MCYxvXQ2fky8u8ZsJN1I9OI1JAfnu/m7nqflxwKLZeI8jXXjy68dyr3bxQANaiRp8OXb rUmaXXwPaB82AxLsEkwVME5oKp6aAB5g3wwupYBw2eVBodxAZmZX8E43Dgepc7Q3bbiH OXb/ZLTkJw7LRL18zOJM+PNk62U+qeyN8bRnm9Gq3AM7J50tx8A02IqluBrtSxGjM2vJ v9NoO0PCfToM4JNZVMAzlR+bi3xABL6qzMsdMhyU5SMQ5aOxuQ6HW5mrahjiIvmtF8g+ xWIRBcw5va2AOCWreWnS3YYrxGDoJaKlMvTNZa4V+uYHKRqmkBmMc9ekaPC+EflVEX/2 +A== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3kngkfu7uj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:14 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2A77Rer9040942 for ; Mon, 7 Nov 2022 09:03:13 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1anam02lp2040.outbound.protection.outlook.com [104.47.57.40]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3kpcymafw7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:13 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Rtu7U6edNv8qqIBuNwwy1H2URqULHB26eNEHVEeZvMT21Yh68qTexfKdKUiQM9EsdNhLFXGrhLwVZAPh+kzMrrk3qhqkVEyIv22bhcB/WRZ+HR/37C869Kmpiwn/YKIz8uM+ueZhSo9QWnaaSTep66QWj4SWsiTD6mppZIxoi6dGDnjQLidPZbDhcYUNVtrXnVL4yw2AL/oBXWJ0dringOkjyGAdrCPpJ+5GuhsFyV+BS5kIM5XihEahcjtdXkm88glmgC57Nl0gp3/mFBUHh7CUhlmbqYXkeEAVvSrX5td2dH2kQvbCOcA5lkILmNtEURsVZow9c3snHFXx3+6Cfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=B2WfycBxt1J9clQm/24saA8kQkhQHjrLi/b6QVLuMGE=; b=mtNTx6236YxNd2fbEsH1K17jtsaaMN6e9qvCg7NCZozJwrpW64T8yEZnv5uD+/AFx1GRckRd9f/P/x79ZKf5teBORQ9pr2xcgUQsdcUWwH0pk2R/BJQTC54e7OZJpvDwhzSbSlXiKbiArhX8MQgjCx9hTJeBKaZSTuVofguZFiIYRvvaNYOzGARjigtf1PFxMujueErRcsWOJ37wz/98PGKZqAn8qI8SWG5RA8pRMSGepRnOKf+QbZ1OVGZVQEzsCgfv7oqf+TcpInaKL/9Q8JBKbm3HZ23V913jnBXXPnnKM14ZPsQztECFdtzkanICiX0QLR3O29sbVltybwXZaw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=B2WfycBxt1J9clQm/24saA8kQkhQHjrLi/b6QVLuMGE=; b=M71Lzwpvehh8H4yuQwHpiDWzu1OB0rcks5T3Tlhu3QVmtMwEACVPFLeQV5cVCh70mpYJWqyV13uodHvPXipZVygJhKMtLEONN7nbt4rBFuSd61adtdVbO1/G1HOmLDT+QWYIDvBRkzbkYeeu+y3kRHssNtiCzOunRdzllR4PSfg= Received: from BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) by PH0PR10MB5848.namprd10.prod.outlook.com (2603:10b6:510:149::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Mon, 7 Nov 2022 09:03:11 +0000 Received: from BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3]) by BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3%4]) with mapi id 15.20.5791.026; Mon, 7 Nov 2022 09:03:11 +0000 From: allison.henderson@oracle.com To: linux-xfs@vger.kernel.org Subject: [PATCH v5 18/26] xfs: Indent xfs_rename Date: Mon, 7 Nov 2022 02:01:48 -0700 Message-Id: <20221107090156.299319-19-allison.henderson@oracle.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221107090156.299319-1-allison.henderson@oracle.com> References: <20221107090156.299319-1-allison.henderson@oracle.com> X-ClientProxiedBy: SJ0PR03CA0375.namprd03.prod.outlook.com (2603:10b6:a03:3a1::20) To BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB4306:EE_|PH0PR10MB5848:EE_ X-MS-Office365-Filtering-Correlation-Id: f9ec52df-9260-459c-c949-08dac09ee5b0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BNY677+CJWueMgrBcwUO+7e+uVd+RvnOaMU1YM1BYA7ozXydQOpe5J9WFTstfecAg3SMYcd+TWDCORscmvm+LQuDWdCCByhpXJKJ5z1hk84FNrogeYAAEtmu0jg44KWYO9fyWCCWA/Ase/WVgXSImLZJlTO7xvUw536U2L7rtNdDXrYdjJAk41ee134CCo2pEvZOB4UkQACzYZV1APN0wAM2QLg47b6ph4us3Sua01djOuAkm/Gx1v0u+gLuQCePLdyExYIUmOPbzRM++ZEpI3IGX7Z3qJg0/pI6CRkvWbnvJrDVxQjMHnpFKfYLhza0bhimcTM0CAtemMQb90Ez0MBSpe+dTto0Lq5DFDUO2rwtan4x8kwkU2JnDeg5hIuzc77+wpNmh7I05kRqWOtyjJkMWw/VKXjZspfahbnq4/oyryUGRNBUqXZPrQGoqHNLseVrcdnsVhXpS6Wq3xOQtz19qtVej83ZJjfB/3u94DNnH9+/WkXhXB4nVkNumnRkPK8TJ7gx2yxIRzAsuUO6XHXUNCYykfTA/IJR97wkfb422hKi0MkCrijX/HKx90eaBE86J60dLJsh3SvD7bCdc7Q1YXimbl/cmHS9NBqCkgc5+i422IwTSyQpbGEQWoMtfvaYGrzhX20xRnKLfH5cdug3Vv886chNRTzUGxDlg/6cmTkJWtDkznuW4mp4ljaZlQqWyB1mBj7Db/LgmmHZ3Q== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB4306.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(396003)(39860400002)(136003)(346002)(366004)(376002)(451199015)(36756003)(8676002)(66946007)(6916009)(66556008)(66476007)(83380400001)(2906002)(6486002)(41300700001)(5660300002)(8936002)(478600001)(6512007)(2616005)(186003)(1076003)(26005)(316002)(38100700002)(6666004)(86362001)(9686003)(6506007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UzcUuayYBQnuKYls4yIOYwZpSj+Xw5DLjvERFsqhZ52WVShW1lGGqSwp24IxEJZJxN/9KFDB3utxsz3ULMZfYojqrL4VsYglTY6++FCTEoS2DEIeyMdzyQAYJskkTvtedAyPQMoy8aBUp45zQRMn2RwXFvSvwNCIGVE2JQu5vQZBrc0D+ZS9v7q1Lzylp+NOCXVX1P4UQtRQXF2tM7+ToZ8PdNUuBb2TU5WCCYu/KlpBNxMAIlE7AjY0JBHaqUh8Rh99I1XTfe7OH8cuCH/jQHmiw1JPeu8/Dut54E4ZPf0468CjDHi8PiSvht1LDNJJAC8sFd5kyiMm95ly6IpzHc6gYvYE9TzKB3HpoDr6VrzhL8iE9FSfXIcTAWcmaJyogDNGkVcflYRxKAbZG6CNRwfhWccH0jgAJWLNI2ipu3Hux0acUdlO6ouFEVp/8FP205JETWQnVgaPf2tYhELW+SlxXc8yiLE2scnUvp7OnqWlnGne4Zk6eOs6UuOFif+n/FY9lTIgybpGqe4t693rYvK4CRmmiAFN52gWU5oTOLk45sqyCjoG3xdcooMxZkYepcf7JLI/HufwaqELYBI3JrwH9xd0zhpYCX0SrQsFb46pDZTWqZj67mSI6w6a48lyZN3sQ92oI3UJxZy15HhyUdQJhNq4KPqmJBTOUrCKWC8/DrWNyZ+4lNzMMnyl+wjio002ccf20fcbNDJuvipAu9xvYyAn3U+xAbXUbe1PQMXbvvOUiIVHniiraC/8OsXtC1CA55eMonrV57f+miTC7EgBPLBRdM0XNfTHMPPamVD3ygYpB4E/V2xXZbl3YLsJ9RdyIjMS82lJr5G06ucmfkprsRHhbO11G/H02cfH9WdGI1pwlyu8/Loz+XDmbPdsURwznYFqvXcj7XvthsmBs/56LIGafrg40ulTvI5f2gexNiLqYLzNUhrAcp7jjhdRa+UQ9RqnU/jbjOGKzNxZyUoR5XHXPJ2vMNDVPwrJWS34TooUrv0VbpM447oCEwvuLn/V/gxIy4Nc+b56PAq1P/3mWVs19IXtNrA7d4ELr63U2tGzZ7uFdgvlLn6yd7g3l0dG52kEfPo0FCNuWEFP6FL2b9JwXroQY1uuG68df7ZuWZYP7ZjnmoJeRyLT3vUMngWmd83+zBtJj5bhCU3vt/oNqjZdnm5UeaS/PpmkGVdI7rxhskjwf2cezgSUfrf3Tp8eomhSnJclJym7Pplv0XB8Ulk/uefWLPP/zqVUglm8Gi4NdN3m1vBzIho978jHWNHkKmeuBzsfon6Sc3iqsMVoOFa394B9MTxKqJRNe25X1v+zVUoDQtMbTnOg6YvYMrGl3HiPNgWmZzcDto6zQKEGzg/6s1n+I+AnkVLMdyiIIt7o1GebrkNG0iN/62omqm4VYi6pvxezdf+6m6UIf6iqzP5fXrhvmxH93ifjrnMwa7UuxT5CeTZltPPDvI+D0wsTIN5cKQWgCcKFUoWpbXxHZl59HTnlTqsgZZTvBKZSol285oUjP9bhh4lKia0flVZ2ywV8bkH1Z0o2I2Ea8KK9tqIMiVFTKZetDHCwrbhW05J25yEacBYtv171k9Zp1fUsq2YqJ+3rYHkLrs4zIQ== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: f9ec52df-9260-459c-c949-08dac09ee5b0 X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4306.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2022 09:03:11.7905 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 0ljmzlEGlcux67+/ZB5g8OkxD0R/OlSo+vX029LTVgGHCF85Qa8Az0H4q6pjGNLkhVls/UZaviQIEHS8rPHKkhST7KP5RJDxyPgpWMhFrQg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5848 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-07_02,2022-11-03_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 spamscore=0 malwarescore=0 adultscore=0 mlxscore=0 mlxlogscore=999 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2211070076 X-Proofpoint-ORIG-GUID: 1hDC0Fy5OC7-srM2lyEyGWfZIiR-OaJP X-Proofpoint-GUID: 1hDC0Fy5OC7-srM2lyEyGWfZIiR-OaJP Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Allison Henderson Indent variables and parameters in xfs_rename in preparation for parent pointer modifications. White space only, no functional changes. This will make reviewing new code easier on reviewers. Signed-off-by: Allison Henderson Reviewed-by: Darrick J. Wong --- fs/xfs/xfs_inode.c | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index f6be7779c9bc..22b1b25ad7f4 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -2897,26 +2897,27 @@ xfs_rename_alloc_whiteout( */ int xfs_rename( - struct user_namespace *mnt_userns, - struct xfs_inode *src_dp, - struct xfs_name *src_name, - struct xfs_inode *src_ip, - struct xfs_inode *target_dp, - struct xfs_name *target_name, - struct xfs_inode *target_ip, - unsigned int flags) -{ - struct xfs_mount *mp = src_dp->i_mount; - struct xfs_trans *tp; - struct xfs_inode *wip = NULL; /* whiteout inode */ - struct xfs_inode *inodes[__XFS_SORT_INODES]; - int i; - int num_inodes = __XFS_SORT_INODES; - bool new_parent = (src_dp != target_dp); - bool src_is_directory = S_ISDIR(VFS_I(src_ip)->i_mode); - int spaceres; - bool retried = false; - int error, nospace_error = 0; + struct user_namespace *mnt_userns, + struct xfs_inode *src_dp, + struct xfs_name *src_name, + struct xfs_inode *src_ip, + struct xfs_inode *target_dp, + struct xfs_name *target_name, + struct xfs_inode *target_ip, + unsigned int flags) +{ + struct xfs_mount *mp = src_dp->i_mount; + struct xfs_trans *tp; + struct xfs_inode *wip = NULL; /* whiteout inode */ + struct xfs_inode *inodes[__XFS_SORT_INODES]; + int i; + int num_inodes = __XFS_SORT_INODES; + bool new_parent = (src_dp != target_dp); + bool src_is_directory = + S_ISDIR(VFS_I(src_ip)->i_mode); + int spaceres; + bool retried = false; + int error, nospace_error = 0; trace_xfs_rename(src_dp, target_dp, src_name, target_name); From patchwork Mon Nov 7 09:01:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allison Henderson X-Patchwork-Id: 13034139 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1DDD2C433FE for ; Mon, 7 Nov 2022 09:03:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231297AbiKGJDU (ORCPT ); Mon, 7 Nov 2022 04:03:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33664 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231462AbiKGJDT (ORCPT ); Mon, 7 Nov 2022 04:03:19 -0500 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DB3321658C for ; Mon, 7 Nov 2022 01:03:17 -0800 (PST) Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 2A75fMHP025318 for ; Mon, 7 Nov 2022 09:03:17 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=HIAnIRA3UC739382SV1AB0MqFsBTLdzPYzCA8y8GH4g=; b=Z98lTHWdN1vF/wfAYlavnTO0xlbbTMIZJ3cvJGZS26USTIkwAlCq1UQznrV/S13VInd8 grNNZ6NFjUvUPpPNcsexDvGah67DN7c+CCN3+ObQa/NyrtT3n48NsrG9oFIfJ5O7cMYy 3IvheENibo1f4H8CxLZfYyBiDgkxs9KVwQRIMwQ2UAIzIoo6ERD59vCXfrX6I7cGMXsb K5eSQ9EtmrshLQxrwEbmiqUhZ7460VB8Hh48BqC6p42iQ7QcHEduKCAlOA/IzuAQVil9 ivpERmcD0Cb1Y2sx3rtLqWszpG3rrOdn2qgeqliEMWsXPPNl98yCfqema+j3Sw+ocsj0 pw== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3kngmj30jr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:16 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2A77bM09015389 for ; Mon, 7 Nov 2022 09:03:16 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2103.outbound.protection.outlook.com [104.47.70.103]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3kpctatm1d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:15 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J94rn1HTR5WqBdtY9qjnKSMQ5MMZWz+m7IceBlAZDki1gVN+TFFUTYV62xVECF1OD4XlFk8U4s6JAVApIgK1Envi/cPztXUDM/xl1AQG1frTYd+UQRN+b+OMlFMU9KMOwGH5MAEJSrBw/CV6/kJLxggEVsVX8oO01T7BXkv/FjbFgxhcQbD3xllQ5tP1yyQyBJyLt029iKToWI+zsRRARrMpg9A7hS06qlIkLLDVqkBqrUNXRNlA0D8UJ4hU8uT0Zllyyzxou54wxHvpIArDvlLfbZ+T16Oiy7I3vAFOmV0fN5yd1a5izZ/6cX4iXAp2wip4IC3VMC350C/xoLX6cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=HIAnIRA3UC739382SV1AB0MqFsBTLdzPYzCA8y8GH4g=; b=c4nZRNyyU9UnsjtPihrWn+1sTDyI5biN/H5IHv+YwK14keP8DeH3c0AOgADgIAkLzp/MdLA/ab4q4o+H6/eRyUg1Wr40Ha23OE2nPGVXBxWSdUtYFEnxJaV+LmQHOJLYo/JgIh82h7ahkafD/m4Wb6NZbSP8MkkLzRZX9D/mjGphy04AttVCRveA6onjA5WgZb1JtcnourMqCsmTw1E3Zm23TLD2A9flO/DnWZ6krQgF6I5+uB1e4+2mh+xaiysx1bPv69rEYHS/fnbVlqGcbH48Oc2CuxJlGVtQMhapKx5ff2Plw50AI+Vo9tYQrvOEtfPdIXqj1H6YFQ3N2dXWcA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HIAnIRA3UC739382SV1AB0MqFsBTLdzPYzCA8y8GH4g=; b=THgpn50o4+lQ7BOFC4czQMrarwnViy2lDRO1tV1oD33WWRZVyQAZZXcJC3bqf8CmozL7jz+bYmmxvPj3jNOfUS2GyXtWao+2H3O11puC0e79cpqV0n0fIou8ok8OzUIS8sKSxExrGqazzYsQ2pCS9jkaCD02ZsChg/WFxku17E0= Received: from BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) by MW4PR10MB6346.namprd10.prod.outlook.com (2603:10b6:303:1ec::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.26; Mon, 7 Nov 2022 09:03:13 +0000 Received: from BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3]) by BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3%4]) with mapi id 15.20.5791.026; Mon, 7 Nov 2022 09:03:13 +0000 From: allison.henderson@oracle.com To: linux-xfs@vger.kernel.org Subject: [PATCH v5 19/26] xfs: Add parent pointers to rename Date: Mon, 7 Nov 2022 02:01:49 -0700 Message-Id: <20221107090156.299319-20-allison.henderson@oracle.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221107090156.299319-1-allison.henderson@oracle.com> References: <20221107090156.299319-1-allison.henderson@oracle.com> X-ClientProxiedBy: SJ0PR03CA0361.namprd03.prod.outlook.com (2603:10b6:a03:3a1::6) To BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB4306:EE_|MW4PR10MB6346:EE_ X-MS-Office365-Filtering-Correlation-Id: 327d800b-ec7f-42b2-3d98-08dac09ee67b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YJ2c4R/qQ8uK51JppaA2DMoVechXL99GMjNwiPr7cHr7LZoDA10HO9WLGWV0SA2jiEf0GTRNN25Ef0X23dNf5E3H92IEOG9AKRFD0Y56cp6LDJcgj2JGm0mDopBAJNdbXl9dTfTvKFwuhn6dqlDFGvOrkDHYpXiLcXWcCThypvcNA/5xt1AtGZKkoxruewAqWPwSp58HQ0RKYc+9yKj5umtKdfu+3jdhZGepslWTmn8TbfZ56rSpcgsYovZR5QdZCnAmNB1lPcnjHmafOvz06h4TRnaUPbxL8QP7mTv0ubkJkJMqMNPDtQf2UVN2VTMAVAP6FfQ6Mmem/hMbmmJEfzn3GczpT03F9I5XDnX5vuwJUtZkgjJh3AEi8fDRPlOvPQ4LTfyvX/XWSXvDTE5nwoj7lGrsi9sunFkbiOKz4THADnS5q+o9LHOZlUYJ/IVtxi9Bk2KE2INQPNj3yddbLyoETXvT5yh/vRtV4Hmcl/+OMlii0NwwPukzkQkJNdix2UzT3T1COcK48cfLKUevIwhnZRwVYmN63hRbb7DkrBDwvBCnlEBcpYySqh6PaFjkccF4TDm5aprUWqcnht2LWjpOQNmSTabmUGK8H9I/2KSFJspMbbtTWLPKHkFmWehPK4rjdUPrpQBgeNjYB/pRJVVcZF/o8lyWgPOyg45oo8WuVDjLt/TjQztAMaNWqrLwcRn1FZxOImSINrG5Hiz9yA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB4306.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(366004)(136003)(396003)(376002)(39860400002)(346002)(451199015)(38100700002)(6506007)(36756003)(478600001)(316002)(66946007)(66556008)(8676002)(41300700001)(6916009)(8936002)(1076003)(5660300002)(6486002)(2906002)(86362001)(66476007)(83380400001)(2616005)(6666004)(9686003)(6512007)(26005)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: mHygaq2OctHXVe+e85rqKprlYgSwL2iJwMR980bwQpVvn+n24ZZEW327/HmAk2bH8WmvdgIw5bJF6PuMtwOZ4OVqnzW7RzERB1mPgdtBUU/pPDoJk+zHccgmlBXfYYXmJU5ZL0mU39BCBhsCE9OlyKgp262j8Y2KrvCQqpvOaoCGk2X22r8qk9qIg9X42VtMXgFV+eHP1iMiwIn54aOYliOGohA6S7cDrBvTUmAR9sPDzF5ZTXXsH4Vie8XCQWf63i00KKFRSBwN3r94wQ4qP6EW7mvsEslwPfJAyQ6o8uxP2nKzxPRb2HKKYvcoTYxTcbxCjWb+oMpkqXtX/J4RD8Zmx2y3uHidY7sNf8hmCtX3BrKNISHJQEtTc5m6pUSgiTtxi/DvwBC6v0RUZbkgrrv/wTebFCXK7t49aFyCDTzglliaXCNOOEL6bC7tgw8+PyD5PWTcN96rZQgXA+RsJknf2823CosbM3LN7w/McXMWDn1Je4GI5GLb99TfAj/fqZZxvWfQtOUnSk5mTVRhGOnWJG8aavHETx3TWFMfo7lkTceWc4XrBhioG+IqCEL35lSh0a6XqIQVuT5OMnwmuxs2ZdP7KOWY+GY5MpfhnMtDsw0BO1Rpne8rjGWLbU+CEW7GRGqhrg3bNaf6WHklvpB9bahk+3jtdeJpWigFh4HqxO8hm9gWcC+/k3QtULy+CE2S7IERy146Xxkm0gqddT/ykS9im83W3gMsd9X9rr2wjqiLqLTrNA7ZTKnq2DEGplUmHZbQMvt1akCrKyz8OV6fflGpSktWmhXgjRZagdv5kRtJfihgPfaaEkJs2exb39u/rh/q+vFWfVdJT99wE7r6zjM9sVNaMfH8+Dzrg7Grs0UU9JiSgj3ItFtYR8/t+qVvF3IgwAnES2gBOTJoLAQ20YW6M0fOZH8CjItJ8cCKRYPn1fbfC6+QJBOBoItWfdoW5Va1KaWh2B2L9UbzsxCk9ByPP2MJULb5tTabgPr8ogtTK4OqgShe5SOsYxQGxHXeEFHFo3cYZUv/5G1bFHbWthXox0BjIls7ZvMZWGDNT4WVa4JfHadfbqzPV3EtvO36hgn5AJqSB7QVcgpyVgRWoxOXyU/ZRUE9YETlCdNelkq7myAhdPU4lejArD6/we0zcbA7UsIscEMFlq4eBf25+49TklsX+UqpaQ+dk5deZsIi2QAZNKEIh63HyCfmtSl87IqeAjgksgK/H/UgZMVK4DQdRBIpjaWkmztAWSvrPRi3aPq8I6/VdmOSyxTeWvdfYsJdG8H3dPgVji1w9kop7Wz99kvbz07omvdL6xtsjv/PJZnJDWcIciB1XzWR6P0KDOTh9OTszzroL7dGw57niNCZLk+jrTtkRT+PcHm+Sh6MCCUCnfKl2l05+bxxdptabm5Wb8HwYN0Xv5mxLQJIoXnkpyJ6jsauMMT/yy4tjlCrDtB115R245l81maYhDBFy309xg/iObZRBkmRqqECg5bL44VUdqG3WynA3iRen8jt0cBDjCvHECXXPxzoddO0PmcbUWJMUOAEREFBZcjNOQZXVEojTIg+flZSLnKvXWqkIQ1Owi/Hx7zmCTBRq2uNEmb5ADvi4TDptYHmGA== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 327d800b-ec7f-42b2-3d98-08dac09ee67b X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4306.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2022 09:03:13.1485 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 7FbiHA7xPyaa+RW93BXxVzr4TmYG/LcXpjiVO+zAA/nzFNsZSLoUcU2TDqnRSxxBM/dC3TMmU87Hyn5PFEiNFuOUqLzsUZf/WBkr15TPA98= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR10MB6346 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-07_02,2022-11-03_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxscore=0 spamscore=0 bulkscore=0 suspectscore=0 adultscore=0 malwarescore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2211070076 X-Proofpoint-GUID: QUsamdUzifvf2HftLs4FlaS5C_wL_Lcn X-Proofpoint-ORIG-GUID: QUsamdUzifvf2HftLs4FlaS5C_wL_Lcn Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Allison Henderson This patch removes the old parent pointer attribute during the rename operation, and re-adds the updated parent pointer. In the case of xfs_cross_rename, we modify the routine not to roll the transaction just yet. We will do this after the parent pointer is added in the calling xfs_rename function. Signed-off-by: Allison Henderson --- fs/xfs/libxfs/xfs_attr.c | 2 +- fs/xfs/libxfs/xfs_attr.h | 1 + fs/xfs/libxfs/xfs_parent.c | 31 ++++++++++++ fs/xfs/libxfs/xfs_parent.h | 6 +++ fs/xfs/libxfs/xfs_trans_space.h | 2 - fs/xfs/xfs_inode.c | 89 ++++++++++++++++++++++++++++++--- 6 files changed, 122 insertions(+), 9 deletions(-) diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c index a8db44728b11..57080ea4c869 100644 --- a/fs/xfs/libxfs/xfs_attr.c +++ b/fs/xfs/libxfs/xfs_attr.c @@ -923,7 +923,7 @@ xfs_attr_defer_add( } /* Sets an attribute for an inode as a deferred operation */ -static int +int xfs_attr_defer_replace( struct xfs_da_args *args) { diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h index 033005542b9e..985761264d1f 100644 --- a/fs/xfs/libxfs/xfs_attr.h +++ b/fs/xfs/libxfs/xfs_attr.h @@ -546,6 +546,7 @@ int xfs_attr_get_ilocked(struct xfs_da_args *args); int xfs_attr_get(struct xfs_da_args *args); int xfs_attr_defer_add(struct xfs_da_args *args); int xfs_attr_defer_remove(struct xfs_da_args *args); +int xfs_attr_defer_replace(struct xfs_da_args *args); int xfs_attr_set(struct xfs_da_args *args); int xfs_attr_set_iter(struct xfs_attr_intent *attr); int xfs_attr_remove_iter(struct xfs_attr_intent *attr); diff --git a/fs/xfs/libxfs/xfs_parent.c b/fs/xfs/libxfs/xfs_parent.c index c09f49b7c241..954a52d6be00 100644 --- a/fs/xfs/libxfs/xfs_parent.c +++ b/fs/xfs/libxfs/xfs_parent.c @@ -142,6 +142,37 @@ xfs_parent_defer_remove( return xfs_attr_defer_remove(args); } + +int +xfs_parent_defer_replace( + struct xfs_trans *tp, + struct xfs_parent_defer *new_parent, + struct xfs_inode *old_dp, + xfs_dir2_dataptr_t old_diroffset, + struct xfs_name *parent_name, + struct xfs_inode *new_dp, + xfs_dir2_dataptr_t new_diroffset, + struct xfs_inode *child) +{ + struct xfs_da_args *args = &new_parent->args; + + xfs_init_parent_name_rec(&new_parent->old_rec, old_dp, old_diroffset); + xfs_init_parent_name_rec(&new_parent->rec, new_dp, new_diroffset); + new_parent->args.name = (const uint8_t *)&new_parent->old_rec; + new_parent->args.namelen = sizeof(struct xfs_parent_name_rec); + new_parent->args.new_name = (const uint8_t *)&new_parent->rec; + new_parent->args.new_namelen = sizeof(struct xfs_parent_name_rec); + args->trans = tp; + args->dp = child; + + ASSERT(parent_name != NULL); + new_parent->args.value = (void *)parent_name->name; + new_parent->args.valuelen = parent_name->len; + + args->hashval = xfs_da_hashname(args->name, args->namelen); + return xfs_attr_defer_replace(args); +} + void xfs_parent_cancel( xfs_mount_t *mp, diff --git a/fs/xfs/libxfs/xfs_parent.h b/fs/xfs/libxfs/xfs_parent.h index 1c506532c624..9021241ad65b 100644 --- a/fs/xfs/libxfs/xfs_parent.h +++ b/fs/xfs/libxfs/xfs_parent.h @@ -12,6 +12,7 @@ */ struct xfs_parent_defer { struct xfs_parent_name_rec rec; + struct xfs_parent_name_rec old_rec; struct xfs_da_args args; }; @@ -27,6 +28,11 @@ int xfs_parent_init(xfs_mount_t *mp, struct xfs_parent_defer **parentp); int xfs_parent_defer_add(struct xfs_trans *tp, struct xfs_parent_defer *parent, struct xfs_inode *dp, struct xfs_name *parent_name, xfs_dir2_dataptr_t diroffset, struct xfs_inode *child); +int xfs_parent_defer_replace(struct xfs_trans *tp, + struct xfs_parent_defer *new_parent, struct xfs_inode *old_dp, + xfs_dir2_dataptr_t old_diroffset, struct xfs_name *parent_name, + struct xfs_inode *new_ip, xfs_dir2_dataptr_t new_diroffset, + struct xfs_inode *child); int xfs_parent_defer_remove(struct xfs_trans *tp, struct xfs_inode *dp, struct xfs_parent_defer *parent, xfs_dir2_dataptr_t diroffset, diff --git a/fs/xfs/libxfs/xfs_trans_space.h b/fs/xfs/libxfs/xfs_trans_space.h index b5ab6701e7fb..810610a14c4d 100644 --- a/fs/xfs/libxfs/xfs_trans_space.h +++ b/fs/xfs/libxfs/xfs_trans_space.h @@ -91,8 +91,6 @@ XFS_DQUOT_CLUSTER_SIZE_FSB) #define XFS_QM_QINOCREATE_SPACE_RES(mp) \ XFS_IALLOC_SPACE_RES(mp) -#define XFS_RENAME_SPACE_RES(mp,nl) \ - (XFS_DIRREMOVE_SPACE_RES(mp) + XFS_DIRENTER_SPACE_RES(mp,nl)) #define XFS_IFREE_SPACE_RES(mp) \ (xfs_has_finobt(mp) ? M_IGEO(mp)->inobt_maxlevels : 0) diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 22b1b25ad7f4..d0b7a93655bd 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -2866,7 +2866,7 @@ xfs_rename_alloc_whiteout( int error; error = xfs_create_tmpfile(mnt_userns, dp, S_IFCHR | WHITEOUT_MODE, - false, &tmpfile); + xfs_has_parent(dp->i_mount), &tmpfile); if (error) return error; @@ -2892,6 +2892,31 @@ xfs_rename_alloc_whiteout( return 0; } +unsigned int +xfs_rename_space_res( + struct xfs_mount *mp, + struct xfs_name *src_name, + struct xfs_parent_defer *target_parent_ptr, + struct xfs_name *target_name, + struct xfs_parent_defer *new_parent_ptr, + struct xfs_inode *wip) +{ + unsigned int ret; + + ret = XFS_DIRREMOVE_SPACE_RES(mp) + + XFS_DIRENTER_SPACE_RES(mp, target_name->len); + + if (new_parent_ptr) { + if (wip) + ret += xfs_pptr_calc_space_res(mp, src_name->len); + ret += 2 * xfs_pptr_calc_space_res(mp, target_name->len); + } + if (target_parent_ptr) + ret += xfs_pptr_calc_space_res(mp, target_name->len); + + return ret; +} + /* * xfs_rename */ @@ -2918,6 +2943,11 @@ xfs_rename( int spaceres; bool retried = false; int error, nospace_error = 0; + xfs_dir2_dataptr_t new_diroffset; + xfs_dir2_dataptr_t old_diroffset; + struct xfs_parent_defer *new_parent_ptr = NULL; + struct xfs_parent_defer *target_parent_ptr = NULL; + struct xfs_parent_defer *wip_parent_ptr = NULL; trace_xfs_rename(src_dp, target_dp, src_name, target_name); @@ -2941,10 +2971,26 @@ xfs_rename( xfs_sort_for_rename(src_dp, target_dp, src_ip, target_ip, wip, inodes, &num_inodes); + if (xfs_has_parent(mp)) { + error = xfs_parent_init(mp, &new_parent_ptr); + if (error) + goto out_release_wip; + if (wip) { + error = xfs_parent_init(mp, &wip_parent_ptr); + if (error) + goto out_release_wip; + } + if (target_ip != NULL) { + error = xfs_parent_init(mp, &target_parent_ptr); + if (error) + goto out_release_wip; + } + } retry: nospace_error = 0; - spaceres = XFS_RENAME_SPACE_RES(mp, target_name->len); + spaceres = xfs_rename_space_res(mp, src_name, target_parent_ptr, + target_name, new_parent_ptr, wip); error = xfs_trans_alloc(mp, &M_RES(mp)->tr_rename, spaceres, 0, 0, &tp); if (error == -ENOSPC) { nospace_error = error; @@ -3116,7 +3162,7 @@ xfs_rename( * to account for the ".." reference from the new entry. */ error = xfs_dir_createname(tp, target_dp, target_name, - src_ip->i_ino, spaceres, NULL); + src_ip->i_ino, spaceres, &new_diroffset); if (error) goto out_trans_cancel; @@ -3137,7 +3183,7 @@ xfs_rename( * name at the destination directory, remove it first. */ error = xfs_dir_replace(tp, target_dp, target_name, - src_ip->i_ino, spaceres, NULL); + src_ip->i_ino, spaceres, &new_diroffset); if (error) goto out_trans_cancel; @@ -3210,14 +3256,38 @@ xfs_rename( */ if (wip) error = xfs_dir_replace(tp, src_dp, src_name, wip->i_ino, - spaceres, NULL); + spaceres, &old_diroffset); else error = xfs_dir_removename(tp, src_dp, src_name, src_ip->i_ino, - spaceres, NULL); + spaceres, &old_diroffset); if (error) goto out_trans_cancel; + if (new_parent_ptr) { + if (wip) { + error = xfs_parent_defer_add(tp, wip_parent_ptr, + src_dp, src_name, + old_diroffset, wip); + if (error) + goto out_trans_cancel; + } + + error = xfs_parent_defer_replace(tp, new_parent_ptr, src_dp, + old_diroffset, target_name, target_dp, + new_diroffset, src_ip); + if (error) + goto out_trans_cancel; + } + + if (target_parent_ptr) { + error = xfs_parent_defer_remove(tp, target_dp, + target_parent_ptr, + new_diroffset, target_ip); + if (error) + goto out_trans_cancel; + } + xfs_trans_ichgtime(tp, src_dp, XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG); xfs_trans_log_inode(tp, src_dp, XFS_ILOG_CORE); if (new_parent) @@ -3232,6 +3302,13 @@ xfs_rename( out_unlock: xfs_iunlock_after_rename(inodes, num_inodes); out_release_wip: + if (new_parent_ptr) + xfs_parent_cancel(mp, new_parent_ptr); + if (target_parent_ptr) + xfs_parent_cancel(mp, target_parent_ptr); + if (wip_parent_ptr) + xfs_parent_cancel(mp, wip_parent_ptr); + if (wip) xfs_irele(wip); if (error == -ENOSPC && nospace_error) From patchwork Mon Nov 7 09:01:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allison Henderson X-Patchwork-Id: 13034140 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DD015C433FE for ; Mon, 7 Nov 2022 09:03:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231530AbiKGJDj (ORCPT ); Mon, 7 Nov 2022 04:03:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33974 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230364AbiKGJDh (ORCPT ); Mon, 7 Nov 2022 04:03:37 -0500 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8FD1A95A6 for ; Mon, 7 Nov 2022 01:03:36 -0800 (PST) Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 2A78uats012294 for ; Mon, 7 Nov 2022 09:03:36 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=DcMUyRUZYA4vB/KdiDXo39mEVzUdDBMQmpLf2vnIp20=; b=07oKBpP5uRsxFdYm5iC9E4qwoHjBM91ggocvAcnS6vNNDo9bDr8GxUfy78dCHXb5FejW FJHbmGgFJqv6xTTGOMvTerRGGuZ+EBSpXTRhAMpg418xQT+UQ0qo2L2gBqIOioHWgePm SPWPvCfL4jdnK7YMfcSp3+bR/F0mB25MLC4GSBMIUW7s/CuFIEAY7G+NFj5jessvXYAy RcgHyD9FbzDfBfd2ie7OGtQCX3t5EOJ0zVKu0/Ia+QOwqAsAhf18sU01xknrsC8tC2xi QfHNXQ4tkIS5sqjuHcAn+8owZKR2SII+0sIcOyXs5fAEVtLkhbNW/ZMkFpXmf4gC31wL eQ== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3kngkfu7v0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:36 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2A77JXo6025146 for ; Mon, 7 Nov 2022 09:03:34 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2176.outbound.protection.outlook.com [104.47.59.176]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3kpcqek6ua-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:34 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nBfYPlNUxz9ULQWeO0zHbHn1nrHbsNKQX2XL7Wnou4+t5io7zzRJ9DqrhiJHJRb9Le9mq+EVPWPe/OVrRLfT9uPr7t4xa732r4mwaVNvnAaLDEwsMPmucMz92es/d3YBslEWAW0h7EcyUEle4256/StnpjMdcCoq+wPLatk0sXoFbR6fDo7jkDdNIb2stotslpYx6VeQb0L5svajYmTQQ0HVO6dUcA9sy+7oHM/QGu5EFQxqykgWlUxiHF7TubMtQDG1OX/3I9zVt9vD47IetR70IP3Xe/ugvJDH0o27oESwDVPh4kRilkjtRTzXLIbEnGIzF0Mb92UYp/dSMlVk5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=DcMUyRUZYA4vB/KdiDXo39mEVzUdDBMQmpLf2vnIp20=; b=MF6qWxnpZpfxQwdUB/WYL0I91G2Hqo6N+6S9Bfa63aAiiWJ+NhwZXNvMQd8czFqoqr+UZFG7nIE3i9h0wwzLLTrKzzf3S6CZF+peCFiU6Gwwm5kk1tKnz0xWp7JKxcfoj9KCNrhYZCsLLCeOjI+L6dEihF/+mvy7TxZVtmw6Y4KNXDjBlDrxyrQvbeIsnAKhprN7TTMVfztAe3s+aclcTzPayYasufWJU1aE6EpiW9IT8NHV68hlN0FzQ9IsyWGIrG3QhlAo94Iw/lJH8ddmzdQvW69wpPB1zn8crIu7Znn8guJ1rCK4uY0y/fsLA0F80H8zQBO/rt2wN/DOvbyhKQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DcMUyRUZYA4vB/KdiDXo39mEVzUdDBMQmpLf2vnIp20=; b=fBPVwK0sP1PJa56TIO/Q04/5MlAoL52kQKIR3vX+YtkbhGQucJvYply6Yoi6u52+CjVJ7gBpng/84GT1NhvEc9b0HupRuiwoo04PVQyDo6aA2w1sDTzFo+IAc6wWJ9ueqLOzG3G3Uv/TNO6DSRiEAyu/YvE8Lm4/8+TNQZIFFko= Received: from BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) by MW4PR10MB6346.namprd10.prod.outlook.com (2603:10b6:303:1ec::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.26; Mon, 7 Nov 2022 09:03:25 +0000 Received: from BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3]) by BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3%4]) with mapi id 15.20.5791.026; Mon, 7 Nov 2022 09:03:25 +0000 From: allison.henderson@oracle.com To: linux-xfs@vger.kernel.org Subject: [PATCH v5 20/26] xfs: Add parent pointers to xfs_cross_rename Date: Mon, 7 Nov 2022 02:01:50 -0700 Message-Id: <20221107090156.299319-21-allison.henderson@oracle.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221107090156.299319-1-allison.henderson@oracle.com> References: <20221107090156.299319-1-allison.henderson@oracle.com> X-ClientProxiedBy: BY5PR04CA0028.namprd04.prod.outlook.com (2603:10b6:a03:1d0::38) To BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB4306:EE_|MW4PR10MB6346:EE_ X-MS-Office365-Filtering-Correlation-Id: 5577d47d-1f2b-4dea-a67e-08dac09eedae X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6PTCVxI32CqmiWwl6a+nM2ATUQdnoyqMFwL1dgGBfd2NhNmeUlkkpb0Dr2ZI3s+E9vbAj/a6yaJ2xN/fuq9VryHdMxkzMn6y8ffetWhYzpF+KClL1SnhPB2IPdLH3h7EvEB8vseUK07ePvi/zIJZkcs+Wv6zCQO157u1A6ZfxKAvcNXRTFCFuR3iULBongK9Wk+D1gMPUwQ3LZI2A/QfnoI+GTubzl+g0MgqyLW4kwZGqkD1UzDpT/hL1lBBWSYqOJ/S88hxWZwa2H7MFq5UWvTluFxsQG6VmpEXTIrZWSrG6R7V29RWfb8PcuOd9GV1Trbf9Gxowb30EJzrfxa+Cf58/Bxas546aveUD7dHMCnyu/OcXV9bSmdpbHzd8x/osvCjqsbtkbBlajsMMRhaGu9q5xFcXevbblvJkreIULnLSH1joyyS/p9TZyUDY4tft3Lmf3bhZJcawwEUZduPAW+JMnKE6MPJw52G//SrGvRbJ6GwgU0fSkrMJpRDSPUNZNmzVunHjRwsZZoIKv6/wYDqGjyZlPndvCyi4sKN+rI8A3XBg4UIQzp5hdpJwlTTUbNpVqqltHHlxofemvuJEIafFfPVQsUwRiXHXrjdb/VLIBpyRgghdS3Hc5HyWZKNPdYcuGPBCnPzh+7bwY4EskTseiHjLlURnuTZkLK7O4ZEyNQ0vg9ODjc4hCMKU+HU8p5Ag+Trc9g/TyWDSVu3rA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB4306.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(366004)(136003)(396003)(376002)(39860400002)(346002)(451199015)(38100700002)(6506007)(36756003)(478600001)(316002)(66946007)(66556008)(8676002)(41300700001)(6916009)(8936002)(1076003)(5660300002)(6486002)(2906002)(86362001)(66476007)(83380400001)(2616005)(6666004)(9686003)(6512007)(26005)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: n2Um9L/GrHrZmIwAb3AgjEPMzMTr3pQPk6D9VopLPl4tr846IAfKH6+mBmPluhMnMXYHtPXEu+WsVyu72dEI01XJ3I+boFj/1Ds00+57FCDH70JleROyypHN1W/bZ5Ip9Yi3va4YlbJ2eTbQv1qPTntNtq2IHqk+7bqQl6Ih5Yzio6bq+YmzYXExtrUKP1B2Eh5WYvesZrO7VBClsDUAERY1bsTk3ctojt5RiyiiM7c3pEPCN9Lyw93dbBvIqfyLKZiokH6LjdG2a7CxH9f505yKg/Z7bsqt96e0j5yEHSzhs0WCzHJTBwTgeJvH3VpAvUrojQR7o+0HVnQ29P54qTodnJTSaH01NBXWmlo9I36BwWame/wZRSig13rfn8B9WXZx+nuIKQZA7OhDWztvIrcVfXVLFkk42gj7wS6UWOWJrGgS5ipXW4Ziap7iebEY5LgEqndsJMrf1c6WprHR+JJSOLtlW5n4p7nNJTQ+VCbGOGnFiZhzBBxa1tGfDwtr28GvK7zRLk0KcEW8nCBGeASUnRgt7EIN9M9sSo67IzF0q/OBGwxvXVRzjKXC/7KtYsDERD9VdBEY+3fSWAIFycGULxFPhbcUx2C3YXQ4YncD0yvDKTXkl7AkJEi8drV/TmiPO9FO0Ee0KlvTC39+k+Yxz6DfO4/Go/J/E29IvrLNAySOjYEI6PtYlE23UXcYgvRciCCqNFeiz2gi1lxbEsU/9uCYhqjtdb4U3WFAlfy63V2J7U9UoqWHS9f7In91egiNgssghs1NPLqg1O+xe94+8HFpKjwhOk1p52dpEdaQQV7jJrHeNZ7OqjBJrEcMnxEWg3EzaWsjaBP2yDU/sOripjQ7P8BUGX9mHsqWk960LPgomflxzRrvEJFrU4RBakGMYfDZ8fWdi9pd+eaVbX32wBlYm2+APAoNkWXQ4XB3iIvnyCBtmQCxvMjmKXuZ19xnhDV8srkBdhrzeUxEMXCOnFGxPFFS8U+S2+xUpZy+FoH7jU2sQ7MX/ZWcYA6He4y+F1XyloZ9hf/nKFVGJof3s8YBt6D8SKGuD2RMraOebpSXDklKP73DWpTFPX+WK3/XKFnMBuijTqXSlZWbU3yxZzi7onAxW/XhhZaoP7eWkc9gtiQ4+4OgqfLnQJ3qb0jF0UYALyQqUH7JTq+RMOb7B/6jxYeJp4BBhLCrpoOmhu47j2UVpFbL1iM3Q0fPgAFU9ZC1vUMWV+qvDssC4rbSgmk1+3+tzueTHIxf8itfS1+JV7W9BYhnGR8ZlNcXACHeRFuwFlBJp2oRv11Segsj9EMORr1RQ3rbFdTX1Mg0WFs+TfwcyeufBFB9SPATBXddje9EEIf8kGmE6K2+BtflBb8L749LFdg2KM4iAykJpnleNJt38whQgwP5hETWfpsw9+iywPr5Kvjxxc0/iTbrnRRl/UtNBKgauKhQ0Jfr028EzO8XHoXIUkE7oUiQtOJiBzbz6fb+JnstxsHnV+LnrNnlgEmVdVszepBc4Q+IwIh1QOGo6LE/svDUg2OwZUT7jWdJgyaQxwZ2MpvFxowgSka/hYLwVQPblBf4rqsGDwOXzWUPU8xMMGiexSiVUlvJN+jdA4sYXvxNwskyyg== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5577d47d-1f2b-4dea-a67e-08dac09eedae X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4306.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2022 09:03:25.2295 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: qsQyPMLt0T8r/OXW4iX1M7b0WmWKkllg68Z7JEmNLCpin4XJmnzHyH1KJEG6bM4GszGA3zbW6dM+0uRvj/r7ws6tQ2FJQZzWJZPHMqe6VGo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR10MB6346 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-07_02,2022-11-03_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0 mlxscore=0 suspectscore=0 spamscore=0 malwarescore=0 bulkscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2211070077 X-Proofpoint-ORIG-GUID: LNtmAsZvKPBGBCxcuuxdaA_bbNBOAw44 X-Proofpoint-GUID: LNtmAsZvKPBGBCxcuuxdaA_bbNBOAw44 Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Allison Henderson Cross renames are handled separately from standard renames, and need different handling to update the parent attributes correctly. Signed-off-by: Allison Henderson --- fs/xfs/xfs_inode.c | 64 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 48 insertions(+), 16 deletions(-) diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index d0b7a93655bd..8cedf76f8e39 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -2744,27 +2744,40 @@ xfs_finish_rename( */ STATIC int xfs_cross_rename( - struct xfs_trans *tp, - struct xfs_inode *dp1, - struct xfs_name *name1, - struct xfs_inode *ip1, - struct xfs_inode *dp2, - struct xfs_name *name2, - struct xfs_inode *ip2, - int spaceres) -{ - int error = 0; - int ip1_flags = 0; - int ip2_flags = 0; - int dp2_flags = 0; + struct xfs_trans *tp, + struct xfs_inode *dp1, + struct xfs_name *name1, + struct xfs_inode *ip1, + struct xfs_inode *dp2, + struct xfs_name *name2, + struct xfs_inode *ip2, + int spaceres) +{ + struct xfs_mount *mp = dp1->i_mount; + int error = 0; + int ip1_flags = 0; + int ip2_flags = 0; + int dp2_flags = 0; + int new_diroffset, old_diroffset; + struct xfs_parent_defer *parent_ptr = NULL; + struct xfs_parent_defer *parent_ptr2 = NULL; + + if (xfs_has_parent(mp)) { + error = xfs_parent_init(mp, &parent_ptr); + if (error) + goto out_trans_abort; + error = xfs_parent_init(mp, &parent_ptr2); + if (error) + goto out_trans_abort; + } /* Swap inode number for dirent in first parent */ - error = xfs_dir_replace(tp, dp1, name1, ip2->i_ino, spaceres, NULL); + error = xfs_dir_replace(tp, dp1, name1, ip2->i_ino, spaceres, &old_diroffset); if (error) goto out_trans_abort; /* Swap inode number for dirent in second parent */ - error = xfs_dir_replace(tp, dp2, name2, ip1->i_ino, spaceres, NULL); + error = xfs_dir_replace(tp, dp2, name2, ip1->i_ino, spaceres, &new_diroffset); if (error) goto out_trans_abort; @@ -2825,6 +2838,18 @@ xfs_cross_rename( } } + if (xfs_has_parent(mp)) { + error = xfs_parent_defer_replace(tp, parent_ptr, dp1, + old_diroffset, name2, dp2, new_diroffset, ip1); + if (error) + goto out_trans_abort; + + error = xfs_parent_defer_replace(tp, parent_ptr2, dp2, + new_diroffset, name1, dp1, old_diroffset, ip2); + if (error) + goto out_trans_abort; + } + if (ip1_flags) { xfs_trans_ichgtime(tp, ip1, ip1_flags); xfs_trans_log_inode(tp, ip1, XFS_ILOG_CORE); @@ -2839,10 +2864,17 @@ xfs_cross_rename( } xfs_trans_ichgtime(tp, dp1, XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG); xfs_trans_log_inode(tp, dp1, XFS_ILOG_CORE); - return xfs_finish_rename(tp); + error = xfs_finish_rename(tp); + goto out; out_trans_abort: xfs_trans_cancel(tp); +out: + if (parent_ptr) + xfs_parent_cancel(mp, parent_ptr); + if (parent_ptr2) + xfs_parent_cancel(mp, parent_ptr2); + return error; } From patchwork Mon Nov 7 09:01:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allison Henderson X-Patchwork-Id: 13034141 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB342C4332F for ; Mon, 7 Nov 2022 09:03:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231168AbiKGJDj (ORCPT ); Mon, 7 Nov 2022 04:03:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231348AbiKGJDi (ORCPT ); Mon, 7 Nov 2022 04:03:38 -0500 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 57CC9120A5 for ; Mon, 7 Nov 2022 01:03:37 -0800 (PST) Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 2A75QkQ9023463 for ; Mon, 7 Nov 2022 09:03:37 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=1ieI1iTrpNarEUnG+jSK38Wg14D8S1+qMAX5zDTLx7w=; b=qdWyukvA4b/JMpKDqmPjAc2dhqywGvmhKTccte9xmyrSDxlYKkIqMXcWq+XPIR1bouMG GU00byZDNrsvwUgceN5NEBghmF3wc1tQbjMWVrZIqScRGUo+jN7XnpN1FEJyhkenH1bO AZAT2yNzbT/VQj9Y4U7hT0l9uc6DQIirHZGOUCScFMXQfO2Ndx4PsgFF6en1RLKGoEV9 ERqG1oLcfxz2BYeHF6b3FweNQi3Wwp0zJLCfBRMfJNg76NTdL4KaQIddCfGYf/0mAlUS 7f20yLlK9DlTjJGrEaenHWl7uHyGdCl4r0apEE+P0TEpbsw29219iTKTMpKoQG3Kko3H rQ== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3kngrek5fe-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:36 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2A77JXo9025146 for ; Mon, 7 Nov 2022 09:03:35 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2176.outbound.protection.outlook.com [104.47.59.176]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3kpcqek6ua-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:35 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=odteA2I5aTOhLJDUvLUjcqwMLi+BgtY16JUEtHWy8RqGpkIXXlFBqN0AsKmVCyz4MhEQLa2cQ2umACvQgHp/02lC/Wh5gvq+tt82BD+cVcduwNMQF97qlwPdQ0P6S2knpfzu3Q/xccBmo3/6bsdvX+P3h8VrrJyyo1bzF/Ek3BL9VZPbApEVzvetBU5ggyHf3CctgaeM9elUhRJWP0NCcXAx4ZxJPg7xo98PoV4f5CDm/XUstlIJ2oktVGoSRItHQDPfHlkZ18llxQbn9IMrtkgs/CTFQdWFlme/5mBEeMNEDVNGUh8NhDzV/fweWTEVLhbU2wT614O4vVbHxcUqVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=1ieI1iTrpNarEUnG+jSK38Wg14D8S1+qMAX5zDTLx7w=; b=mNGIrJUqa+Rm9p/d9aKgrI7VtLlybv/6aOsbfHCQ6AjWPVnQ9abYEGViwgVPmjcQTHh17TFJq7kyXbCH18eXAu6Dr5fQuionyGWTm6rreF9/w7Vw+nTX8jfo2DY28PAAXZcnAGiqnh5WAuG0ZbXTh4UNoto2nu3fe0I1zu+6PHOwRP8RfZ4uk6dfJvGHaLts/vFOpPqFaIwObFPGeOn3aODSJ1VdrY8wGwU5RzmTMBVNDtGlxZP3QwbEn2Lw4pNgXyGjDjQsZpYyop/r/En6O9OIfDB53nuDn/unuNB5PayOmUZw2Ny9AjMi2G7/yGYSoY729QzrLVIX+uRvdOOPhg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1ieI1iTrpNarEUnG+jSK38Wg14D8S1+qMAX5zDTLx7w=; b=Q8DJr672xTPxosNkzCpXNynB1ChBh5hoztO4pv5ESk+7+7BOz/aiF0TAAGaiViC+PuwN4Cpj1ifBO/aB1tNFY1n9gVZVQVH3P2VEraLRhEr57FRoEgu/obR2yU/Z3B60IgsgkMNVYnF7r8hJ9BvIDf7UtWbPiZdLuszoZO8QZSI= Received: from BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) by MW4PR10MB6346.namprd10.prod.outlook.com (2603:10b6:303:1ec::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.26; Mon, 7 Nov 2022 09:03:26 +0000 Received: from BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3]) by BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3%4]) with mapi id 15.20.5791.026; Mon, 7 Nov 2022 09:03:26 +0000 From: allison.henderson@oracle.com To: linux-xfs@vger.kernel.org Subject: [PATCH v5 21/26] xfs: Add the parent pointer support to the superblock version 5. Date: Mon, 7 Nov 2022 02:01:51 -0700 Message-Id: <20221107090156.299319-22-allison.henderson@oracle.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221107090156.299319-1-allison.henderson@oracle.com> References: <20221107090156.299319-1-allison.henderson@oracle.com> X-ClientProxiedBy: SJ0PR05CA0152.namprd05.prod.outlook.com (2603:10b6:a03:339::7) To BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB4306:EE_|MW4PR10MB6346:EE_ X-MS-Office365-Filtering-Correlation-Id: ea3ae1e1-aa1b-4561-6c61-08dac09eee47 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eW8LCAMuCdbt1/oMHj66niwFVl85YNAB9Ed5vhQJD4bIfiMQVLNBJfKtud4uNIf9gw5vKqcOd1O2Giys6HclDQ70mXc304gfYuYQIKq+Utc133tZTGZqeprTpr4mDMIyL3xfnzFSbTJKme2Pi1uGmbFDTTdiePfsvwRRxIy3Rh7SMNOu4tlQwODmZjuA0xPlFifPwwsMAWxWkHs7dlyMBAHln9xv6fk6bG1o+wAAqiROZ41lysQGFaYPWaN0yaTkJvErymjti/TDvl6o3Sh8AwFaEU6da6Hn8/lQxCHlcXhU0ziJ2ySyhvQUYpIoPHjRKTOntiV0UBdZdq68UsOaC7og0bNN3xznISyY3A/tRDnxcmnGu8ha8PnHMLzL4XFTZb87OBf+NYwtJna7NUVvvp5pUnxReaMKCtoq/7SQCuUveRpuNA6pGBkPNsyBXPUtaDK2LBqsC7STbm9noO0S1SUDy2sNJSkYGgNQFqjAey/au2cg1ZH+RYKMiuWAg52/K/GsxyO9avBdgs/xcJ9whqqrGGxPNJDeRr0e8oan/li5J/dDOY5DWOQ5N0Mk92fR1WC4i8J2fMyZCwhud2mfbPdeXIwbHC1KgJrnrH4vI8M+GYHK89Gb6GN4IRAzakzto6o1FQz+mtmBy1Ck+GzBZu4w4XDL3a7x4brv9Bdd7WGgjjVoK0228nrEWMfpM1tYDnCT3ZU9+XzkzH9EDvHLPg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB4306.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(366004)(136003)(396003)(376002)(39860400002)(346002)(451199015)(38100700002)(6506007)(36756003)(478600001)(316002)(66946007)(66556008)(8676002)(41300700001)(6916009)(8936002)(1076003)(5660300002)(6486002)(2906002)(86362001)(66476007)(83380400001)(2616005)(6666004)(9686003)(6512007)(26005)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: S/tYMiYQgdYHP5vJQHm9e2D7WaVeYju+C7cxe/7ObjKxVnk1+PetBgmj1WxjeMuk+pG3XiNPka6oeMwPln30Ch6sZMAKtrPuYAX3AvZrqTV7+Tj2Zi/IKzqajdZg3EvQ0ZucI5sk6iw2dV2wCbXqbYTf2lubCyu2CD7TIQ8iydrDBuABuGeOU2t9YEjqIFTo7/UoGZRybmVwGDYr4PNw8qiL/Dkqu0ODLldKNYCVRVtptyP/eje5AckwkPpfqesiNO14K8dCSN6/9CT+Dtd+4Xm/1Ch2UfadsKBhP5l/Zwrt5vFRL1gFRnW8TCnAgG0+SF00TP2I6ZWRStaHNMJnkOgujU5lpAG8nJXxknf0tYz04Haup0YLf6Nsav+hBCbKNZLH/ibWXNtl/AKNA+0YMSWdvhShMbbcBrOuStssxg8zXmFdo4uGAX75wn15acc1RwMJ7WVZOli/yGUPavJnaRRhsPmDaV6UCMR7jHjTe1QKM3TYyejrtbJ6TYwyIxIB8OQOj8BRtqIhn5pPzESKllQ3EcMTFMGsIevPIXeW9y0HbP5msTGR9+Sy7ZQ4MJz3FQxQeHTSfPVnQA/8ClZw5xbzmB49Jzy/CQgfqVqQoGH0jO0rxM2/LqodqZX5N7LqQAw4xSpNsq5ZSzb9EEOWNu1yJ2gwr7SF0N2bEEzM1SoHzXsFVWJEV3JRxPlxvp2IKyeA+Zerf8Xh+yoLT8lkRrIiZ3xd2PPxrEUjHy/nqOU2gTCzbE6TVYRLBZNZk1afXHue9lLBfWE+30ro9lpEi7BkyPF8trbq+BWkyQeF7NRVI69TzZZ7loyxnMdBdUOx19QDljhfaCcXdbMCc5tdLoPs2m+9whyC/umT988/R5NvNvuPdnAcke3oW0no0NdQ3QNRVtUo8iXUU8n6EfxoiyS7xplYk4cgvfV1lgEgQbujNSRI8T8gjij8owI86FbpDF2r7ZPfAaQLwpJYIz6ox+0jaR3X9tWY8gbjvja7a9IE6BSFoJRzd6bA/l9RyN+o2h+1cdY3gH+tdTQVZfp0JFOpmvxAnlF5Cs1LZFX7ju5tOHvICCEo0hyUPLJyIUonypvFM52j6wIaDa5GF3xDeqU76a2eUmjLSsIZI/KZG9/JI3fRoC9NcRUOtQRlt0W20hsfW1H0KIvizBF1tFRGVnf4XNZc85tWd6lDD0jxdia4o5HfPmkfYueSEpyaIcR3/uhqIAe7SXqXNAMbSQZFd3XzJRlnbh8Cn5KEprwRk/jUfFmP139SZP3WTuvp137qM/FvyaG06wBHxQRyoEWQ9y3InlZ2ZzE2MoPKQyL0GiWkjU4jsfAeuyU1kAHVxRGTVKMOJU9hpqr1hfN6x4ihndMIVT6SzaJCMAfXnefv5GDp9MwlOATTiLQsmKKND3emQnlOIvbqrWhpmQGX9hkzWeA9gTLZi3nlXXOJatGXm4X59BhYn717zUJGsq7RomN6us+i/pLK3Wd33rw56eF14USEXLWK6JBmB2Rbvn6US68n/f5CKc4CtlxGA+xP7oNNpzsDvmemNwoLwjKu28hCC17EpOwzyD394wf3mf77CSZ52eRKnXfe/t6j5f2bFAovejKpmaYfcIdoO4fISrZh4Q== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: ea3ae1e1-aa1b-4561-6c61-08dac09eee47 X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4306.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2022 09:03:26.2151 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: TEV3dysIQwwsXPl1iODOJSFDuIUbpX4otNgmR272gTBZVjS2Z11Aff/ZfYxA4q1kxAqsAI99tVOOXmVI+Cy2NUj8zQkFwgaToC6XW26C24M= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR10MB6346 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-07_02,2022-11-03_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0 mlxscore=0 suspectscore=0 spamscore=0 malwarescore=0 bulkscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2211070077 X-Proofpoint-ORIG-GUID: 2HsHLAg6tQKTtusaZH1xCpEcyP44wQc8 X-Proofpoint-GUID: 2HsHLAg6tQKTtusaZH1xCpEcyP44wQc8 Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Allison Henderson Signed-off-by: Mark Tinguely Signed-off-by: Dave Chinner Signed-off-by: Allison Henderson Reviewed-by: Darrick J. Wong --- fs/xfs/libxfs/xfs_format.h | 4 +++- fs/xfs/libxfs/xfs_fs.h | 1 + fs/xfs/libxfs/xfs_sb.c | 4 ++++ fs/xfs/xfs_super.c | 4 ++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/fs/xfs/libxfs/xfs_format.h b/fs/xfs/libxfs/xfs_format.h index 371dc07233e0..f413819b2a8a 100644 --- a/fs/xfs/libxfs/xfs_format.h +++ b/fs/xfs/libxfs/xfs_format.h @@ -373,13 +373,15 @@ xfs_sb_has_ro_compat_feature( #define XFS_SB_FEAT_INCOMPAT_BIGTIME (1 << 3) /* large timestamps */ #define XFS_SB_FEAT_INCOMPAT_NEEDSREPAIR (1 << 4) /* needs xfs_repair */ #define XFS_SB_FEAT_INCOMPAT_NREXT64 (1 << 5) /* large extent counters */ +#define XFS_SB_FEAT_INCOMPAT_PARENT (1 << 6) /* parent pointers */ #define XFS_SB_FEAT_INCOMPAT_ALL \ (XFS_SB_FEAT_INCOMPAT_FTYPE| \ XFS_SB_FEAT_INCOMPAT_SPINODES| \ XFS_SB_FEAT_INCOMPAT_META_UUID| \ XFS_SB_FEAT_INCOMPAT_BIGTIME| \ XFS_SB_FEAT_INCOMPAT_NEEDSREPAIR| \ - XFS_SB_FEAT_INCOMPAT_NREXT64) + XFS_SB_FEAT_INCOMPAT_NREXT64| \ + XFS_SB_FEAT_INCOMPAT_PARENT) #define XFS_SB_FEAT_INCOMPAT_UNKNOWN ~XFS_SB_FEAT_INCOMPAT_ALL static inline bool diff --git a/fs/xfs/libxfs/xfs_fs.h b/fs/xfs/libxfs/xfs_fs.h index 1cfd5bc6520a..b0b4d7a3aa15 100644 --- a/fs/xfs/libxfs/xfs_fs.h +++ b/fs/xfs/libxfs/xfs_fs.h @@ -237,6 +237,7 @@ typedef struct xfs_fsop_resblks { #define XFS_FSOP_GEOM_FLAGS_BIGTIME (1 << 21) /* 64-bit nsec timestamps */ #define XFS_FSOP_GEOM_FLAGS_INOBTCNT (1 << 22) /* inobt btree counter */ #define XFS_FSOP_GEOM_FLAGS_NREXT64 (1 << 23) /* large extent counters */ +#define XFS_FSOP_GEOM_FLAGS_PARENT (1 << 24) /* parent pointers */ /* * Minimum and maximum sizes need for growth checks. diff --git a/fs/xfs/libxfs/xfs_sb.c b/fs/xfs/libxfs/xfs_sb.c index a20cade590e9..75e893e93629 100644 --- a/fs/xfs/libxfs/xfs_sb.c +++ b/fs/xfs/libxfs/xfs_sb.c @@ -173,6 +173,8 @@ xfs_sb_version_to_features( features |= XFS_FEAT_NEEDSREPAIR; if (sbp->sb_features_incompat & XFS_SB_FEAT_INCOMPAT_NREXT64) features |= XFS_FEAT_NREXT64; + if (sbp->sb_features_incompat & XFS_SB_FEAT_INCOMPAT_PARENT) + features |= XFS_FEAT_PARENT; return features; } @@ -1187,6 +1189,8 @@ xfs_fs_geometry( geo->flags |= XFS_FSOP_GEOM_FLAGS_BIGTIME; if (xfs_has_inobtcounts(mp)) geo->flags |= XFS_FSOP_GEOM_FLAGS_INOBTCNT; + if (xfs_has_parent(mp)) + geo->flags |= XFS_FSOP_GEOM_FLAGS_PARENT; if (xfs_has_sector(mp)) { geo->flags |= XFS_FSOP_GEOM_FLAGS_SECTOR; geo->logsectsize = sbp->sb_logsectsize; diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index ee4b429a2f2c..664d01bf29ec 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -1663,6 +1663,10 @@ xfs_fs_fill_super( xfs_warn(mp, "EXPERIMENTAL Large extent counts feature in use. Use at your own risk!"); + if (xfs_has_parent(mp)) + xfs_alert(mp, + "EXPERIMENTAL parent pointer feature enabled. Use at your own risk!"); + error = xfs_mountfs(mp); if (error) goto out_filestream_unmount; From patchwork Mon Nov 7 09:01:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allison Henderson X-Patchwork-Id: 13034146 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8B200C4332F for ; Mon, 7 Nov 2022 09:03:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231462AbiKGJDo (ORCPT ); Mon, 7 Nov 2022 04:03:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34034 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230434AbiKGJDn (ORCPT ); Mon, 7 Nov 2022 04:03:43 -0500 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A878A120AD for ; Mon, 7 Nov 2022 01:03:42 -0800 (PST) Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 2A78w14m013639 for ; Mon, 7 Nov 2022 09:03:42 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=iBWgTidIg243fVrCpW4A4ODifWUh8GXxnsTSYeGREiE=; b=pMOW/NHCRDCTs/1XoS7G5rLTjy5Mtcuc2clmYZtLLON3XdjsswUDaSa9HY1kEJXUVoNx CSobZnPmXONdCgQsrxwMbzhfiFBVwAEaMkNe8dnVcbxnK53KqnvKuFNE5E0MkltWay4q aqlyxBRYzyBOofkbreR8xNido05JAiBm9Ltv1yDyYzgIpNfHlVDyIfRiHeVhMvXo4sl6 /mKO/JF3l+JsXACdBXmflGeLMPD4FtF3yym1ndmM0ITT9wP7LQui3LI0hlCy3eFM9y8v Py4wd+Xy8RpgEUdZkd7/jjQXZFMFtXris5Xqxu6VHxyoXh3W4bxhEd0SX9jc2MlGwaIG UA== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3kngkfu7vb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:42 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2A77ftub001503 for ; Mon, 7 Nov 2022 09:03:41 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2102.outbound.protection.outlook.com [104.47.70.102]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3kpcq0jm86-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:41 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z0QPOqBRO2SY9QY7mNVSR8dD2SbSy5E9QBmGQp5w0VGrpxv9YKEzlPAELsqPJjb/FZWag86CjToJQ1R+stZKTSOmp8qhaSv/KVVpYdAWkx5aLeDqfYZq1DyZpAvJto91p2g8e6WIy31nJG/o+PND2FxhdlOh3i0TnV9XH+Vj5LH45LKLCdaETcRedVNY2W+Ll9BDXQ7PPilg1EO05mCD86M3gYN+gN47q52r7+J+t3CleCxAs0V1H2GJi5L3zKGLmTjaWsbvvOEM6Icmvcr6EgIjlnS6q4VsMDr8GRLBlHNXxoBANbf0824hDH5dBV3RLhjrxY0fwIT3TwvH4esWfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=iBWgTidIg243fVrCpW4A4ODifWUh8GXxnsTSYeGREiE=; b=SFiIh/o6KboEmFNJymudyuaW/YnVhBl46GsXqhpvpJ+NzuwvGObJDcvR2Aab/5iROsEtlwGtnQGuh080BMd7X92sq7Xk0kOs0HuifI4HqBxvQcxNReWpOlAwtPQvuNTa8Xsrj9h8T1f9pnxMCY6D1NifJ0rXScbW4xYdzDCC/2W6uy6tCdVnSgk7ISr9nEi0vYDTXezgsDcRY368OEOmk941iFctoN97dy6sMpkS+FmzrEKK/0vI67uTEfkluPGVWcghxmyu+yE3ubDMQlP7oUjoBJhzu6LMM9pSercEgfGs0uiiV3l0lOLAAcY8zFqCGzH+R9nAH0fRJaFLlszVkA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=iBWgTidIg243fVrCpW4A4ODifWUh8GXxnsTSYeGREiE=; b=jn5tqoL0iGWR7aYXdxw/zmmqTwOkca8qF0ioHq4UXer4yWxrf9UdT6iujUFQUXDM7JFqRYG9JZ8MxGTgi3q5G6jt8gsDK9pcD7/8iT/oMmN5gRSHdG4etLOeLPBPYddTICZsG0bna66HRC+o1ebAnFcfeaLdCvDrQUNJdZFqyqU= Received: from BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) by MW4PR10MB6346.namprd10.prod.outlook.com (2603:10b6:303:1ec::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.26; Mon, 7 Nov 2022 09:03:27 +0000 Received: from BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3]) by BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3%4]) with mapi id 15.20.5791.026; Mon, 7 Nov 2022 09:03:27 +0000 From: allison.henderson@oracle.com To: linux-xfs@vger.kernel.org Subject: [PATCH v5 22/26] xfs: Add helper function xfs_attr_list_context_init Date: Mon, 7 Nov 2022 02:01:52 -0700 Message-Id: <20221107090156.299319-23-allison.henderson@oracle.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221107090156.299319-1-allison.henderson@oracle.com> References: <20221107090156.299319-1-allison.henderson@oracle.com> X-ClientProxiedBy: SJ0PR05CA0064.namprd05.prod.outlook.com (2603:10b6:a03:332::9) To BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB4306:EE_|MW4PR10MB6346:EE_ X-MS-Office365-Filtering-Correlation-Id: 24c28de9-5f4b-40e4-e922-08dac09eef03 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LWp4qC9UgqDTBryG6dRyESKpJqTA1+w7brXGQ/r3iSrQKcNzsxhm2c8t2klA6YiN+rYm9mxZlYkNE03TqWyWUWTmFfZyMhxnqEoZQlggxDxm+RdUaTB7w4OYsp1fJV+oElvKrBXxfODZUbR8fvT6QECvJs9m3//ZHbTg3l/jbR5XqBB7DPfLLPXn3NSspWv/cIX1GERcFiKKZnmBAo0pVFFIZ8ldHRNvBiuXG1S9I3g42yrB3/ujBQBl/BuL6JBVQb9ppp0DgYB91hJ7n23a9on/80Bdtlgb/cI+MsKOwfTlicmgzl/l2HoNLp1NwIEX7PYSVHOjSel1LKAIiSNxP3ImGaZycEI0JPKR5lVDLql02kIsfYcd2DJTxIapsAjfUhPsZBH+QUjcslxo1px+9kbXftXdC92noUHLWwsBncG3Z+bWx83ZwE9ZY6FUxcft6KOngz6ew2p29uhCmRm9qCxYZifl1kvtaYLfPVBEQ4I0yf2gPoudpT3u/ZTH+gG5nc/tvhcjG6YC1LUGcr4pisC3yxMIN1cFgzLDoKgy5RU6N0njeACa0biaKMWw2WLrqCPEXd139kxyOLe3LPeGgFY0OlYC3BnHygJlICHUQ6j9Ih8UQfVNmYT9hCFl6AkcUrB4hq4Z8I4Dd2Tc+CJrGJvsXWVEUJ3zB4yaPe2snbzczazH22IWUpRtfWmUU9QYYRD8kNvW6yNnu+kOaNfyog== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB4306.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(366004)(136003)(396003)(376002)(39860400002)(346002)(451199015)(38100700002)(6506007)(36756003)(478600001)(316002)(66946007)(66556008)(8676002)(41300700001)(6916009)(8936002)(1076003)(5660300002)(6486002)(2906002)(86362001)(66476007)(83380400001)(2616005)(6666004)(9686003)(6512007)(26005)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: p79FXyXr4AAh6BWhkxwdr//bPGuwgb7wscnxQHGq0Bkgi/rzHUcxvnxFvM2E9BT+TU6KmLRTI5dBA8HvKTAMymJUjxAOeWooqIlR8zIQl+t1YDJsZeopq8Bh0qKdHCHSLyEJ+htrga0eAMV03WrVq6jBcj8ubS7Yq+12E/F2MFsCDh76gIDUH0Y8ff1Li7C4gqnXa2wCuydhVuq4jguoVLjQMBXf6DfAim7yJdfdNtlEkOOrJNlV5u9LANjTFzX2c33mjf/X6MylyvPIKj7NFnfDFVxYwb1YehJShQ4fxDW3vAejVHeo+QcpAOf+zsr0+sVujKKPppN9zQOEFCF1PoTTkKVZCRPCQKCcAo1bBBuv2I3weqYmheXYPphEdcPNjSc1J0sNgnRnniOU0MdPjZUTil301QsclyMMHrW0ewB98m/aGF3gel6MNNygJPF79mLHlozOR/op88uTrw2/bw2BdeG4Qm9weZFV5aFs3EvE+g+tWxZXZ3zj3zZyYcbYBUJ946/PVa5xdAoANu9L4tilhiminxvBrKpIZJCAnZkpOWzykVKn+RTNgAnsx/4pJRgc5TQh2ghMvBh/wUlaxhVWV+u4CCmGaV9D3J7RDRT4qmv9b07GNnyo2htpIqCY3JXZnB+Fpawa8CN5LqmkAleNMjdFBw5VnmQqNhopxB1yX6mojltAZpc2GYEJCr/DLP3AKgV0Y8eJIgc/QDoQql5FeSVGQhDxgJOPldj5xLwMbUcUcYVCsSsBng6qK2DNS3+UabkgAo+OehpZJbhXq/mhhuNO+KqHLeJO49q0eWSxIfhAf90ysab0tTxCxotSvoaFAcc+NAzEGN8WsvCzxriB/+R+a2tc6maZ6QbgAmh+V5rkoptKs4mOtgbcY9WhnLl0D8t02GAFNfz2intBehW4xrYsCJPg4cyKFOxFrZZauY1TQQE9nxOK4nV1RPM77UUvtdpr3c6Q97PXiQy+dH15m21oew9NOhqRxsoYNKcjC1kEfoQwRtI/r1XyAzmsutI6shmfL2mK7yHaqcAUY19uC28QILsjekS+rw11pIV1In0B2MHRMvl+efPzm6d6TGTdjOh+RioLFbNVdDsONQ14qLWhcKt10J94XTP3JcYL8H4JtcXvA61KIZRAMDRu7pAa+hb4DJ1JRyGifBJhZcaKSecUpt3M1LYlz9OSNll4Y9S+HAyQGxh8YLrJkli2dfx54ii4xH19q7v3D5U3aih1SSlrsOV3TbW9QE/lm0uCzNVNd0/7cj45pSW9a0kBqeDdAmbfY23eUvFEbw1dOh3le0bbSLQGG/Lz/wfmLlV/oayvUMo0VG+piZkoRfT5EBn1NIlM2LXepc0JypsUdqr9oO4wxycglgjLelh5sh705yxocVGHD5tuVyKs1maSVrdUOTpLkE046+DMJf3iu7auWHwQSWxb/IrX+hqHqpDvYOFPeQvbqPEXcHtQvQMQkGQQOE3nkMtU3j36+NXxtxgFAm14Oyx3K34peNEl6wZpZQ7kpophQtofnMQUqqcmP8j1XVtkVFrJ2grKhnLSxwTV+AOO/PJCLzk/VU35S7wI0774jG5SPBRvUt3i1J7y4/6gYVnF4DvPXOpBnAEfWw== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 24c28de9-5f4b-40e4-e922-08dac09eef03 X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4306.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2022 09:03:27.4516 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: L+WL847dbprMhnpp2EIhOqEDS4EPB11smi/QG4ykR/ybUyR8ZW6N00qWcx+zE1HlWAvfv7mljFh5hcZsQcCZd4Ues0bLscOi5NBaxkMmTgw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR10MB6346 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-07_02,2022-11-03_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 spamscore=0 adultscore=0 malwarescore=0 mlxlogscore=999 mlxscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2211070077 X-Proofpoint-ORIG-GUID: kmx5CWvPg8FK1DpjM6ATXahAc0ztMI3T X-Proofpoint-GUID: kmx5CWvPg8FK1DpjM6ATXahAc0ztMI3T Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Allison Henderson This patch adds a helper function xfs_attr_list_context_init used by xfs_attr_list. This function initializes the xfs_attr_list_context structure passed to xfs_attr_list_int. We will need this later to call xfs_attr_list_int_ilocked when the node is already locked. Signed-off-by: Allison Henderson Reviewed-by: Darrick J. Wong --- fs/xfs/xfs_file.c | 1 + fs/xfs/xfs_ioctl.c | 54 ++++++++++++++++++++++++++++++++-------------- fs/xfs/xfs_ioctl.h | 2 ++ 3 files changed, 41 insertions(+), 16 deletions(-) diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index e462d39c840e..242165580e68 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -17,6 +17,7 @@ #include "xfs_bmap_util.h" #include "xfs_dir2.h" #include "xfs_dir2_priv.h" +#include "xfs_attr.h" #include "xfs_ioctl.h" #include "xfs_trace.h" #include "xfs_log.h" diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c index 1f783e979629..5b600d3f7981 100644 --- a/fs/xfs/xfs_ioctl.c +++ b/fs/xfs/xfs_ioctl.c @@ -369,6 +369,40 @@ xfs_attr_flags( return 0; } +/* + * Initializes an xfs_attr_list_context suitable for + * use by xfs_attr_list + */ +int +xfs_ioc_attr_list_context_init( + struct xfs_inode *dp, + char *buffer, + int bufsize, + int flags, + struct xfs_attr_list_context *context) +{ + struct xfs_attrlist *alist; + + /* + * Initialize the output buffer. + */ + context->dp = dp; + context->resynch = 1; + context->attr_filter = xfs_attr_filter(flags); + context->buffer = buffer; + context->bufsize = round_down(bufsize, sizeof(uint32_t)); + context->firstu = context->bufsize; + context->put_listent = xfs_ioc_attr_put_listent; + + alist = context->buffer; + alist->al_count = 0; + alist->al_more = 0; + alist->al_offset[0] = context->bufsize; + + return 0; +} + + int xfs_ioc_attr_list( struct xfs_inode *dp, @@ -378,7 +412,6 @@ xfs_ioc_attr_list( struct xfs_attrlist_cursor __user *ucursor) { struct xfs_attr_list_context context = { }; - struct xfs_attrlist *alist; void *buffer; int error; @@ -410,21 +443,10 @@ xfs_ioc_attr_list( if (!buffer) return -ENOMEM; - /* - * Initialize the output buffer. - */ - context.dp = dp; - context.resynch = 1; - context.attr_filter = xfs_attr_filter(flags); - context.buffer = buffer; - context.bufsize = round_down(bufsize, sizeof(uint32_t)); - context.firstu = context.bufsize; - context.put_listent = xfs_ioc_attr_put_listent; - - alist = context.buffer; - alist->al_count = 0; - alist->al_more = 0; - alist->al_offset[0] = context.bufsize; + error = xfs_ioc_attr_list_context_init(dp, buffer, bufsize, flags, + &context); + if (error) + return error; error = xfs_attr_list(&context); if (error) diff --git a/fs/xfs/xfs_ioctl.h b/fs/xfs/xfs_ioctl.h index d4abba2c13c1..ca60e1c427a3 100644 --- a/fs/xfs/xfs_ioctl.h +++ b/fs/xfs/xfs_ioctl.h @@ -35,6 +35,8 @@ int xfs_ioc_attrmulti_one(struct file *parfilp, struct inode *inode, int xfs_ioc_attr_list(struct xfs_inode *dp, void __user *ubuf, size_t bufsize, int flags, struct xfs_attrlist_cursor __user *ucursor); +int xfs_ioc_attr_list_context_init(struct xfs_inode *dp, char *buffer, + int bufsize, int flags, struct xfs_attr_list_context *context); extern struct dentry * xfs_handle_to_dentry( From patchwork Mon Nov 7 09:01:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allison Henderson X-Patchwork-Id: 13034142 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 10319C433FE for ; Mon, 7 Nov 2022 09:03:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230364AbiKGJDk (ORCPT ); Mon, 7 Nov 2022 04:03:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34006 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231462AbiKGJDi (ORCPT ); Mon, 7 Nov 2022 04:03:38 -0500 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 802AD120B3 for ; Mon, 7 Nov 2022 01:03:37 -0800 (PST) Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 2A7903g9023373 for ; Mon, 7 Nov 2022 09:03:37 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=acbjfF5lLh4Gil/z1wg3K0sLLs9EzUUYHdbdaKRxaj0=; b=osE0bWgck7ME5YVjjWVULYLXV6w7zzK2PmVeci4FdxniZ7heO1LtUTnIDQ91t/cc0keF Myjt9pdVpPp1steT/MZn72dBEdo1RLBLskey2W1zp8muulDCZzHCqMD3UbQIY8x1jE/+ 96MbHr5Fr4Pmh+GShtOL90qxBQJu2LPEfyGyoL+k0FER/sotUUTdbX2YWvlIleJmTwKy 2JpuBqkanQNX1BXxTs8IeLqhekgTmO3oTmrs9zD7ySH2DLd2bhhB8Q68EOv76H+wYlw+ ydYwqaVEQ/Agy3MaJGmbqgaFZu77ii4EjwG0ccFHPSgD82IWabgp/ddHRdGeB/cEzOSK xA== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3kngrek5fg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:37 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2A77JXoA025146 for ; Mon, 7 Nov 2022 09:03:35 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2176.outbound.protection.outlook.com [104.47.59.176]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3kpcqek6ua-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:35 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SiFj/tKwVTbN7lnUFoUjJLxb2Oxp1KvbymWKfua5aoqbCMM3HdKtbxfX76EMz86hZv1QR8HpuMtb3kA34Hk/2Gr72hg3TCy+/6xvWStHfCbT0+sA/veXFyk9brYvB7hgAJCjbEFzxkCEB71Cj3kb8sXXHWumtim2M28URwQ8GBEr8YoUG0ADS4EFvnAFXoVDMX6VRBpvtsUU++n7C0Mc7CymmCoCaOU8RROrCd1fHI3OCqt7V6OkRfnUqlzgS/hHtCpaoSUUwnK3NGEpeWaaQAPT41maUn+o0bmfVJ8xOmIWzCIJPoLd8YiXU6qyj2nZI6hzkgKFheGkWRGbLVobmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=acbjfF5lLh4Gil/z1wg3K0sLLs9EzUUYHdbdaKRxaj0=; b=gtEOBzgMlImwMTep0Rrs+HJp1dg4rsqXro/nrIdHd5HbmouCmSH61Jto8ECZqiGEpnN5hdqu9NFcFajyHcJTRoeW5cMMgR3LFFGHF7f6+dXwOgCzuv01x/5CeI0f9bhe4n4/AEuNlfiPLmC6nEOhFScacj0yN4GCkthnhYIxOUQT94R+UphGo2c3FIASfa4erBHgZBN+1EHQvHTJgHt0uAiY+CI9/Yqx3KjTDB6mM1bIFXuQyQ821/NVydT7RyUknEsS5LzDiecsAW9yC/IfcRZd/yA5X6rV6zdmq7M0GrrKVk6/TIjHEhr+ky7Oc790mgBLXTUf7s0yQVDKS7HONg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=acbjfF5lLh4Gil/z1wg3K0sLLs9EzUUYHdbdaKRxaj0=; b=QLoa0vDzwbI7hXUPfT6ff4OXhpXpTURRFEKHsNWLGGiEx2EqluRjftuuKeB5Qsapf1zfynW3AqeZIUu/lKD9U1gmwYHx2umkZ7UmZWmt8roSU7fVtGIAWWPjEPkHILIFRfTzmhTxqfKVSNnNLpwMX849zfmmWNex8XGPGFrCTL4= Received: from BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) by MW4PR10MB6346.namprd10.prod.outlook.com (2603:10b6:303:1ec::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.26; Mon, 7 Nov 2022 09:03:29 +0000 Received: from BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3]) by BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3%4]) with mapi id 15.20.5791.026; Mon, 7 Nov 2022 09:03:29 +0000 From: allison.henderson@oracle.com To: linux-xfs@vger.kernel.org Subject: [PATCH v5 23/26] xfs: Filter XFS_ATTR_PARENT for getfattr Date: Mon, 7 Nov 2022 02:01:53 -0700 Message-Id: <20221107090156.299319-24-allison.henderson@oracle.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221107090156.299319-1-allison.henderson@oracle.com> References: <20221107090156.299319-1-allison.henderson@oracle.com> X-ClientProxiedBy: BYAPR21CA0029.namprd21.prod.outlook.com (2603:10b6:a03:114::39) To BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB4306:EE_|MW4PR10MB6346:EE_ X-MS-Office365-Filtering-Correlation-Id: be56a27c-92d5-4ea9-75df-08dac09eeff2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aw143ao+K5UaFoIpbl4QmPSwFYYBnT47Zm+umWZ1Dq7X3x3PDZMoQ4xtgosp2t1Ol3YwUU/ZDoqS+HJWCxchBEqVdGrjB17vxc3Odz0xrQGj7dbL3/d0ipzxW35tMM3mxlv9gVvW0MtPOcUtexhR6ZBpa/j8GnYcXXUS64rKYKIK4uOoS5XnJ2rn27HBSwcHVAno+c++R1m2sOqx186UZ1H74harwReYZe3NswWmnFKSV0+IDT3unJbsSY3/M2xgdTWN41ea9vWCoUUpR/qkM6kn7WMSzAxlmnV807V6YTKuUthxPWjfLqqOTttsVY9dRPLyuI6qquuFgyGoTs4cd7ttAp86V1/eBhuxWXF3OY5UXcbljXWkzfCVFbcAfyiD8c0Hn+yyv4rVEue6Av/TVPMX4yGTXmQvYiAQCyKN93thJv5L1mEt2ZsGWtMVVKrlxCVgV1UXjfa5tDtsySU+jR5PYVNzAysJCdl4p3VSOlEkIQpU9SAzGlLnA+h40E5LabedRz6KBtaexEhgi+UXaniJF8p0d8K97CvfB4BMGg7u8MQ0Cb0ponVbztKQDC/2fxXV6lV1zk3lvZse+emwXFuJ/xDhP56kohJA+Q11Md0PYrBxL0fDF29OQN7MfxGkiFe+fu/O/C8jcA8nwvVcoAhQwG39D9D6LHARrANubyUYsXqHrVmDXLdE63eU/fS3KKFFVfWaLROeDgNUP8UARw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB4306.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(366004)(136003)(396003)(376002)(39860400002)(346002)(451199015)(38100700002)(6506007)(36756003)(478600001)(316002)(66946007)(66556008)(8676002)(41300700001)(6916009)(8936002)(1076003)(5660300002)(4744005)(6486002)(2906002)(86362001)(66476007)(2616005)(6666004)(9686003)(6512007)(26005)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qvsXgcGTB/s5EvZeS9J7gksdeoQwT1B9iWYpuQZP77oUlbtd7gfn1lzvZt5xWyMQQijNqN6EVLMVXdUl9qPhGc7O7bh42eRrqBnwvygMt9Ml66t/oJ2CxvyrNwcGjwU5bZRHQhxspaYygjkyiiE96tYWCGq5nXKnwBSMQpGUquaB2WAB9hcP+iBJl0H1rsIJwcjswekmJvKEGWuhmO/RjiYOCo8yBk+OheuVlVQfOKwlfWy3ElewCo/7UBZUl3jr3QM0Q9/JIyefu+TLpHPzQ1oybCfOxQj4Ggyr965S9yNJBQNsdq8cwUPFullAnCq5LleGo4TcyQ9+I8m1tpgd7is1eQWmR5CMlvsNi1470NtqLkCofo4oMXVXMgdEsO1GOg1DHhqc/WqQII3DrUgusmN0Gf1YjEI7iEXcnhsqs7uVeLd84euE89453gC1qeh+Z2T3Ex+xulyaODkkBR8id3zRjfGGy+pIRN0DVkDuYYpfTtBn1N1VgL5PoinUckHMmn3qh0QR12F3dBG8kuRsTqlmkEZg11rKa/XjVaevLd1k78+3moC+HHKiZD+jHZyvT0W5Bp6ylMQOcju5QiKBol0kc9jZePwnhpdT/1p41GcsNraMV6MqBNIvB2tL3xXzGKByq0lHoBmw2accVjd1QhZMoATJttE5SJ9AVv4idX9QpZtYSlFEY/qh1MyFMqHGIqpZtlTdgwoH0yha2Pu3hg3Khh3GPy0dMRpwASXOh73t6jkDCnc1k6D4A6zSxpqq7Su9agZE6UNj0gk/eQEGwi5hlB6YCke0eLPfee+AxQO7pjDYfHIBIKX5P2fCHTs79ZmZW5FMEwiL0QjIIRJeVRruThqot5FcRXLJTZx/t2Swa2jybIU4nmxKwSOcCiGkTPXW/GzPkzIWj37VoFVB/8OWSRTA1tZEtq+XVKftXQxsrj6G8z16/+MaMEep+NnTV/FSnWu+gWHuxfTTW/xwZxNYA47GQVCjndvkrVsDZyperZkdZW0S+rSU3FPmPLupt9Dzlfl481gi1wmBmS+h6r2nV1vDCle2TPJ7LMJTRd4jcLdKUXE4n6Y6K8e38+t7MvE+MpmN2HaGUeSFmO4lyvpKjsabeQLL82CfChhAHN/2Nu3RW8MAtpirfTCPiYwK53xHHRypAT2bwp9EQ6SnjJpk9S0JxPLN3TgxXGeDXtrLmBMm5LBIQQKq6lnBNKP2jP31q8SQbq/2lT4vnrWL5R5Kvs0DyFfbD+ILyCpVGVlNmiJmURJCPcReCsnP3sMI++u4K9iQieTBlT5I1KsydJvm+RZZ0X9HrC0cYhsRd7HSGMFlm7Ul3WqX+F3Paeuc3JvrsJTUJk1fw+RGL2F432CbTunf2/duyO81Byoa0kBXnm7KfzkQ3rI/TESMN6G+vnVS4FVfRANYI6BN+t0mKMFWLjFO7nuDts1LQnq2yQZ8zWE6ghdJEGqtU2XM9s76xvKlQZiYdIm9ukx5kNiOLnPT+W32pt/HluAMiZGVuWVrTCZ3vOhkTl4Jd9c5H/zqKrI5mlGgeIJ2Tl8s4EgyAkXKQZ7vVA+4GXuLiboUzn/XGejfUr3mm691Bf+N4AseVbpTVff2F5PJaVoKN+GNfg== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: be56a27c-92d5-4ea9-75df-08dac09eeff2 X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4306.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2022 09:03:29.0294 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: bQp4yrNQnIMfqKLYEKnLotJBa6jApJa4nhwC6P8sFvBgVhPVMLqGiSzLC8v2RJcEX2BVEDy01iRSHdijNK9CSJsbjS7bb/wTla5YSvGXktg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR10MB6346 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-07_02,2022-11-03_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0 mlxscore=0 suspectscore=0 spamscore=0 malwarescore=0 bulkscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2211070077 X-Proofpoint-ORIG-GUID: CvWpCmY6i0akv96fz9qbKSYnbCEb2Px5 X-Proofpoint-GUID: CvWpCmY6i0akv96fz9qbKSYnbCEb2Px5 Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Allison Henderson Parent pointers returned to the get_fattr tool cause errors since the tool cannot parse parent pointers. Fix this by filtering parent parent pointers from xfs_xattr_put_listent. Signed-off-by: Allison Henderson --- fs/xfs/xfs_xattr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/xfs/xfs_xattr.c b/fs/xfs/xfs_xattr.c index d9067c5f6bd6..5b57f6348d63 100644 --- a/fs/xfs/xfs_xattr.c +++ b/fs/xfs/xfs_xattr.c @@ -234,6 +234,9 @@ xfs_xattr_put_listent( ASSERT(context->count >= 0); + if (flags & XFS_ATTR_PARENT) + return; + if (flags & XFS_ATTR_ROOT) { #ifdef CONFIG_XFS_POSIX_ACL if (namelen == SGI_ACL_FILE_SIZE && From patchwork Mon Nov 7 09:01:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allison Henderson X-Patchwork-Id: 13034145 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 64410C43219 for ; Mon, 7 Nov 2022 09:03:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230363AbiKGJDm (ORCPT ); Mon, 7 Nov 2022 04:03:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33972 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230460AbiKGJDj (ORCPT ); Mon, 7 Nov 2022 04:03:39 -0500 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 225E512762 for ; Mon, 7 Nov 2022 01:03:37 -0800 (PST) Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 2A75o3dV023913 for ; Mon, 7 Nov 2022 09:03:37 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=NfyTHvJ12BPv5xdzPYkoMXbZyAFtySg9qdXVH2ZVC+Q=; b=HifVmuXVo4JAk/VOPEssV6my1q1j+gjQws2t2oapIFm92C72NQqBRdbPM9BmB2mF5taT 1vWbZGIKm99U18KV9TBjiiM9UIrgW3b7LSSNmN2aoPKrpaL6j5vbgAeBKxXAf/xru+I6 ZrGBf2WpYzpkyoFKz2ouz/UDe+4egwWgXKRAJXrlnoMFp1SZR1V75r7P6W/9b34hCIXq 1ZInDT3HYnuUg/GJUUwPxFHCX4yRvTzfwMPp5/QX1BaNM22yyvebjRGPQQjJVQ+AdMTd 2PdP86t7OhRyc5/Ve+gk4bDdnyF1FYw08I8H21PTTpYO+EwTQXJMo718Q0tVnAxDboWp VA== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3kngrek5fh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:37 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2A77JXoB025146 for ; Mon, 7 Nov 2022 09:03:36 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2176.outbound.protection.outlook.com [104.47.59.176]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3kpcqek6ua-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:35 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mGB1r0OIyCT5/l4KGw0wf3lPc8/wZn9xtVB8vHLVA/AMxDFoswNJR84xDkclIevOM01tEuuQGWJ+B0PjuUEeqrffPHSAXRbMM8fUQjddSC+3cv7q7m5w95N7h7whCgd9PVWEKu9+1yJL0OuIbNmcazCZfGKpYgToL7A/nBKyLpF3VJi0ZwWdkdUBdvGCnVt9snHAqcjaSr63637ZJy+k9j9IV76WpxzcdzcnQQWb/5hjdezCoV+z8p/JlydzVRPaH22W9CrBwc2q3Ly6w9HqoRtg/ZkhYzPH3A0ip0ZFDYpgnG5oV1OAB2mx7PXEhHfQRXA0ROuaXVdnh42S3wI7tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=NfyTHvJ12BPv5xdzPYkoMXbZyAFtySg9qdXVH2ZVC+Q=; b=UHSJyfbtyrp8d+2u/+Idfr3StvVZazZ2Aq7OzeRD3d72Hj+bLlXFVT36n7uoFGZasqEgnMLF3ELNH48VjgTyPJ63RqBC7fufXvWkkrHfNtNXc2C3zDlau87DBLta2VQsAV2ktrCcSrKFHLIVvhh01kEbMqCFZndfGI5axAPxTYDdUfgoB3XlzEOp2rxMtIALhe6t5rSkSBA2nT5i4lfTBqCD+Bk+KdKqLrxTg1YtF6IloFaxkq58y05udvEjXL2WoVoKaNp8EV04C1D/yyttqQf3ZVRMDjI23Ql2lftUV09z5wpZRXz0Vkz02o9X7yQXygDtPeNc/niwS9j4ANEq/Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NfyTHvJ12BPv5xdzPYkoMXbZyAFtySg9qdXVH2ZVC+Q=; b=rG7GewNxflF9oHsVlurOMaSeBGveulPTtN0hbZsk78qcbP1ZW/BiO10aoIbcEG0QFDzgMUIdev+SLeWe3s1MTSh/Sjz8OIKpZpBE64m1YXWMyo6RImtqxdPeS5O7MBdNq9C1HFEXxAhelrnSbhhpW1lTu0A2vGvwUKP12PzAqwM= Received: from BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) by MW4PR10MB6346.namprd10.prod.outlook.com (2603:10b6:303:1ec::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.26; Mon, 7 Nov 2022 09:03:30 +0000 Received: from BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3]) by BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3%4]) with mapi id 15.20.5791.026; Mon, 7 Nov 2022 09:03:30 +0000 From: allison.henderson@oracle.com To: linux-xfs@vger.kernel.org Subject: [PATCH v5 24/26] xfs: Add parent pointer ioctl Date: Mon, 7 Nov 2022 02:01:54 -0700 Message-Id: <20221107090156.299319-25-allison.henderson@oracle.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221107090156.299319-1-allison.henderson@oracle.com> References: <20221107090156.299319-1-allison.henderson@oracle.com> X-ClientProxiedBy: SJ0PR05CA0206.namprd05.prod.outlook.com (2603:10b6:a03:330::31) To BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB4306:EE_|MW4PR10MB6346:EE_ X-MS-Office365-Filtering-Correlation-Id: 6514d481-f5e3-4f45-e45f-08dac09ef0ba X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: b4T0BJ3aUBuGLVb5U8FnfJ5J8XthCA4zc//JgCNi5Rln4bG8HLdzhxMr7+e0540zzXjflDSIzGY8jAXYj7vngKHnhQkHgZlJJAJqkgF4SNYl2HtgdBI5SLTPAbtwkHNnZDjVf1wn5j9UBVHoOptrnKk6OsUQ/ZJVP4frAG7lNC8pfMxgOT8kfcwuGSn73tKya5G6y5fo+/UmSIbMaUttG5WHzqNGuZbOg5MTRMdBD7mAWeaWFFL2vejsYc9JlfINw2TNZUb7I97UUr8pou2hjQYlyLUnKMmkxegA1J0Hq756eVpJZwtuz5jPg5v77xl58clGmleBLD/AF/pko4j4o02w/Wmv6+Yucw9sTuRKYsWISJmfuXVZWg1JRgrpijxG1hlkLNd07xOyOa+jSAeHWbuAwwnTru65jqPBXAaz1UV8aD+sufMXkC7oqQsXNLyRg4a5NEDRtMPLdm/O49Lcqo2F0Pda44lnQfTJiMXNGVj1vxAcfKOWUpwxgGYPy8ovUjORU0k8sntJJfAv2XqkX8X6gQ9BjMNys0fTcEueFnJpWhA+D84ZUsyxs+9Zt5zR2W9hPy+ObCwH0qqVjT/tjZOqYaRNVENYJRCIUraXATv9Yol1tVi9/Qmmf7AuIX94R6APST7yWgmosiO+pun3dG+guZJ3tsqWQq4FDHCEv/vFHx1IYfxGBQA7sHJ2lnHJdz4aTR2FfGwvJWpsD1vYVQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB4306.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(366004)(136003)(396003)(376002)(39860400002)(346002)(451199015)(38100700002)(6506007)(36756003)(478600001)(316002)(66946007)(66556008)(8676002)(41300700001)(6916009)(8936002)(1076003)(5660300002)(30864003)(6486002)(2906002)(86362001)(66476007)(83380400001)(2616005)(6666004)(9686003)(6512007)(26005)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 92vOu2ThSuahybetojJfUjUKWOa5alpLBHKJ37ohHQ/cu8CLNldOtJFZwD1eBHet9Inf3Mj+MBMUST12+lcKLF4zJzZj00mJgGuNs7TZ2BSZtDN1Zy2OU/GR3jB+J9dGD9m0fpb7u9ZOb0EzyC/r+vlGu8e1BGeImrWi1X5xHIqdJ4PPlPZD8g/Y2P6jo6J1kmYif4xZ3/tpvRyqH/li2Ad0rt8KqX0E05D/CID48fM98UgAy2OmxP3WmWMNFhhwC+fM8yRIDeWzwqfiLLKddruYM3VzPm4+M9xj7sXtUuI3UQDtMcl5Io1Pd2ySEWDGSJe7qItnr4kPTkWDiuu4vWfrxUh196N/cY6rESLUxYOu5L1Rjfagt/yCWaqNWI00SwTO2Ztj0lHXDizQsOCa+YX2RDrPpK4GmwsYyqy5rW9M1Oh1ROGmzUN1IoL/Nb4lIGuoSuE6yDJz17Vh3sstTlL/etle4EzDgCcTu91wekle6dYR7PG7mDzfJfoKffKjBGW5liUkAXK6jR3qq1c/VXzjavMZxeBj/yiZk1x3e25fnWASL7kwKbUwKwqOl7HsSXMxaPK+bQxyEK3jKPSV6Kv3Y40TcHdBuY/Y+a9qPKAktStHbdIUsUIC6HL0d5ujb/r9JY34sesbCCWktEcDqJaxlCmSfbWNPmOVvQKV3pbDIp8uj3kBg1QCFPKWFaTCcXTNY8/zgIF3fNojAhUYfhsrY0UGsPG4X/QkdITDgFkGwRSdDcjaAz/LmuRXeRk3eLzb1UiDH+txl1MT0ES8KuaJfpQnx2JAC7/dLTvnulm1XhEU6pZjNnbek9/bYO3KzOh1IEmzISlwZpvowB+QigpLAGj2sPpjVUITg0nPoqlcoDWGUqaYyBPgW6QT+GBdsR5bKnoPFibPg5psayyNu9mAjpmXmFJMrCU1ZGfr4KwPB9RHnUnig6oV8CCFwUAX2/DGr34+MdR7vPCWCPIs8b8vuhI2kHd+ie973zNbu3eHHShBk9xdliBblaRFs0pQIviNifsPrXuki0GWVV86DK6zi3jYzonnSXwkr1f1e7G7cytq4DpeX5idVilmezxYqPlTGRau9m9ULt6cloiUBxH3fJvu3BgrXyHA7TBb0JsjWwYSsxMVeHloCFxMAUy0j/EnWN5knKbFtllqlrSJRqD9ZsjqS/jUi/Lx6X6axlqzEdNslUH3H+nMYJa1t/CQPfQrE9hF9UOZtiRwUjuVPswc1ucqrO/OD1u6M5Di2fNp/FNFrzZDH98o6tOAvOapip9yEH883gFzoo6dkn/x0LXWQsaajEX+ZUakLV+cphfzthAp/r2tFni1y91yh0d2jgL0rYmDyu+EMPlE+W72uJ3DLvQaR4IQkiQujFjzg0cFNpFzQp4nTBIIknWg+U3DQzBN4B+cwIZVOG3j4emhzTQtOwONmaE6ZbSHYx9VWiaHXWk15qHXcfkfVPPdH0c5jdGiVUaJZzHk9uSmzuG4uomn//urPyszItoHX9VSgD4hB0cVoB6Zxo2W8j1dImjeDhLBMebE3zhIYTqPOr09ZRRldHzU4qL/IGdYkqM/2IrnblKjNnhfV3PyPer4C167fuTmTzUGBx228HSKr958Uw== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6514d481-f5e3-4f45-e45f-08dac09ef0ba X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4306.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2022 09:03:30.3273 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: CxO8E6q/aE8hx1HR4zC/e8/os4T5jTMt7UoIgMVBi286LpbZIG58niplkY9vEXXtVDa3lksQTAJEjt8Pe1ccOyUYhCYD5ksGCfqrO+FJYk8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR10MB6346 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-07_02,2022-11-03_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0 mlxscore=0 suspectscore=0 spamscore=0 malwarescore=0 bulkscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2211070077 X-Proofpoint-ORIG-GUID: LiCXhZALbMUOHc3F90GsVSOp560R0liv X-Proofpoint-GUID: LiCXhZALbMUOHc3F90GsVSOp560R0liv Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Allison Henderson This patch adds a new file ioctl to retrieve the parent pointer of a given inode Signed-off-by: Allison Henderson --- fs/xfs/Makefile | 1 + fs/xfs/libxfs/xfs_fs.h | 74 ++++++++++++++++++++++ fs/xfs/libxfs/xfs_parent.c | 10 +++ fs/xfs/libxfs/xfs_parent.h | 2 + fs/xfs/xfs_ioctl.c | 94 +++++++++++++++++++++++++++- fs/xfs/xfs_ondisk.h | 4 ++ fs/xfs/xfs_parent_utils.c | 124 +++++++++++++++++++++++++++++++++++++ fs/xfs/xfs_parent_utils.h | 11 ++++ 8 files changed, 319 insertions(+), 1 deletion(-) diff --git a/fs/xfs/Makefile b/fs/xfs/Makefile index e2b2cf50ffcf..42d0496fdad7 100644 --- a/fs/xfs/Makefile +++ b/fs/xfs/Makefile @@ -86,6 +86,7 @@ xfs-y += xfs_aops.o \ xfs_mount.o \ xfs_mru_cache.o \ xfs_pwork.o \ + xfs_parent_utils.o \ xfs_reflink.o \ xfs_stats.o \ xfs_super.o \ diff --git a/fs/xfs/libxfs/xfs_fs.h b/fs/xfs/libxfs/xfs_fs.h index b0b4d7a3aa15..9e59a1fdfb0c 100644 --- a/fs/xfs/libxfs/xfs_fs.h +++ b/fs/xfs/libxfs/xfs_fs.h @@ -752,6 +752,79 @@ struct xfs_scrub_metadata { XFS_SCRUB_OFLAG_NO_REPAIR_NEEDED) #define XFS_SCRUB_FLAGS_ALL (XFS_SCRUB_FLAGS_IN | XFS_SCRUB_FLAGS_OUT) +#define XFS_PPTR_MAXNAMELEN 256 + +/* return parents of the handle, not the open fd */ +#define XFS_PPTR_IFLAG_HANDLE (1U << 0) + +/* target was the root directory */ +#define XFS_PPTR_OFLAG_ROOT (1U << 1) + +/* Cursor is done iterating pptrs */ +#define XFS_PPTR_OFLAG_DONE (1U << 2) + + #define XFS_PPTR_FLAG_ALL (XFS_PPTR_IFLAG_HANDLE | XFS_PPTR_OFLAG_ROOT | \ + XFS_PPTR_OFLAG_DONE) + +/* Get an inode parent pointer through ioctl */ +struct xfs_parent_ptr { + __u64 xpp_ino; /* Inode */ + __u32 xpp_gen; /* Inode generation */ + __u32 xpp_diroffset; /* Directory offset */ + __u64 xpp_rsvd; /* Reserved */ + __u8 xpp_name[XFS_PPTR_MAXNAMELEN]; /* File name */ +}; + +/* Iterate through an inodes parent pointers */ +struct xfs_pptr_info { + /* File handle, if XFS_PPTR_IFLAG_HANDLE is set */ + struct xfs_handle pi_handle; + + /* + * Structure to track progress in iterating the parent pointers. + * Must be initialized to zeroes before the first ioctl call, and + * not touched by callers after that. + */ + struct xfs_attrlist_cursor pi_cursor; + + /* Operational flags: XFS_PPTR_*FLAG* */ + __u32 pi_flags; + + /* Must be set to zero */ + __u32 pi_reserved; + + /* # of entries in array */ + __u32 pi_ptrs_size; + + /* # of entries filled in (output) */ + __u32 pi_ptrs_used; + + /* Must be set to zero */ + __u64 pi_reserved2[6]; + + /* + * An array of struct xfs_parent_ptr follows the header + * information. Use xfs_ppinfo_to_pp() to access the + * parent pointer array entries. + */ + struct xfs_parent_ptr pi_parents[]; +}; + +static inline size_t +xfs_pptr_info_sizeof(int nr_ptrs) +{ + return sizeof(struct xfs_pptr_info) + + (nr_ptrs * sizeof(struct xfs_parent_ptr)); +} + +static inline struct xfs_parent_ptr* +xfs_ppinfo_to_pp( + struct xfs_pptr_info *info, + int idx) +{ + return &info->pi_parents[idx]; +} + /* * ioctl limits */ @@ -797,6 +870,7 @@ struct xfs_scrub_metadata { /* XFS_IOC_GETFSMAP ------ hoisted 59 */ #define XFS_IOC_SCRUB_METADATA _IOWR('X', 60, struct xfs_scrub_metadata) #define XFS_IOC_AG_GEOMETRY _IOWR('X', 61, struct xfs_ag_geometry) +#define XFS_IOC_GETPARENTS _IOWR('X', 62, struct xfs_parent_ptr) /* * ioctl commands that replace IRIX syssgi()'s diff --git a/fs/xfs/libxfs/xfs_parent.c b/fs/xfs/libxfs/xfs_parent.c index 954a52d6be00..fa3d645731a9 100644 --- a/fs/xfs/libxfs/xfs_parent.c +++ b/fs/xfs/libxfs/xfs_parent.c @@ -27,6 +27,16 @@ #include "xfs_parent.h" #include "xfs_trans_space.h" +/* Initializes a xfs_parent_ptr from an xfs_parent_name_rec */ +void +xfs_init_parent_ptr(struct xfs_parent_ptr *xpp, + const struct xfs_parent_name_rec *rec) +{ + xpp->xpp_ino = be64_to_cpu(rec->p_ino); + xpp->xpp_gen = be32_to_cpu(rec->p_gen); + xpp->xpp_diroffset = be32_to_cpu(rec->p_diroffset); +} + /* * Parent pointer attribute handling. * diff --git a/fs/xfs/libxfs/xfs_parent.h b/fs/xfs/libxfs/xfs_parent.h index 9021241ad65b..898842b4532d 100644 --- a/fs/xfs/libxfs/xfs_parent.h +++ b/fs/xfs/libxfs/xfs_parent.h @@ -24,6 +24,8 @@ void xfs_init_parent_name_rec(struct xfs_parent_name_rec *rec, uint32_t p_diroffset); void xfs_init_parent_name_irec(struct xfs_parent_name_irec *irec, struct xfs_parent_name_rec *rec); +void xfs_init_parent_ptr(struct xfs_parent_ptr *xpp, + const struct xfs_parent_name_rec *rec); int xfs_parent_init(xfs_mount_t *mp, struct xfs_parent_defer **parentp); int xfs_parent_defer_add(struct xfs_trans *tp, struct xfs_parent_defer *parent, struct xfs_inode *dp, struct xfs_name *parent_name, diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c index 5b600d3f7981..3cd46d030ccd 100644 --- a/fs/xfs/xfs_ioctl.c +++ b/fs/xfs/xfs_ioctl.c @@ -37,6 +37,7 @@ #include "xfs_health.h" #include "xfs_reflink.h" #include "xfs_ioctl.h" +#include "xfs_parent_utils.h" #include "xfs_xattr.h" #include @@ -1679,6 +1680,96 @@ xfs_ioc_scrub_metadata( return 0; } +/* + * IOCTL routine to get the parent pointers of an inode and return it to user + * space. Caller must pass a buffer space containing a struct xfs_pptr_info, + * followed by a region large enough to contain an array of struct + * xfs_parent_ptr of a size specified in pi_ptrs_size. If the inode contains + * more parent pointers than can fit in the buffer space, caller may re-call + * the function using the returned pi_cursor to resume iteration. The + * number of xfs_parent_ptr returned will be stored in pi_ptrs_used. + * + * Returns 0 on success or non-zero on failure + */ +STATIC int +xfs_ioc_get_parent_pointer( + struct file *filp, + void __user *arg) +{ + struct xfs_pptr_info *ppi = NULL; + int error = 0; + struct xfs_inode *ip = XFS_I(file_inode(filp)); + struct xfs_mount *mp = ip->i_mount; + + if (!capable(CAP_SYS_ADMIN)) + return -EPERM; + + /* Allocate an xfs_pptr_info to put the user data */ + ppi = kmalloc(sizeof(struct xfs_pptr_info), 0); + if (!ppi) + return -ENOMEM; + + /* Copy the data from the user */ + error = copy_from_user(ppi, arg, sizeof(struct xfs_pptr_info)); + if (error) { + error = -EFAULT; + goto out; + } + + /* Check size of buffer requested by user */ + if (xfs_pptr_info_sizeof(ppi->pi_ptrs_size) > XFS_XATTR_LIST_MAX) { + error = -ENOMEM; + goto out; + } + + if (ppi->pi_flags & ~XFS_PPTR_FLAG_ALL) { + error = -EINVAL; + goto out; + } + ppi->pi_flags &= ~(XFS_PPTR_OFLAG_ROOT | XFS_PPTR_OFLAG_DONE); + + /* + * Now that we know how big the trailing buffer is, expand + * our kernel xfs_pptr_info to be the same size + */ + ppi = krealloc(ppi, xfs_pptr_info_sizeof(ppi->pi_ptrs_size), 0); + if (!ppi) + return -ENOMEM; + + if (ppi->pi_flags & XFS_PPTR_IFLAG_HANDLE) { + error = xfs_iget(mp, NULL, ppi->pi_handle.ha_fid.fid_ino, + 0, 0, &ip); + if (error) + goto out; + + if (VFS_I(ip)->i_generation != ppi->pi_handle.ha_fid.fid_gen) { + error = -EINVAL; + goto out; + } + } + + if (ip->i_ino == mp->m_sb.sb_rootino) + ppi->pi_flags |= XFS_PPTR_OFLAG_ROOT; + + /* Get the parent pointers */ + error = xfs_attr_get_parent_pointer(ip, ppi); + + if (error) + goto out; + + /* Copy the parent pointers back to the user */ + error = copy_to_user(arg, ppi, + xfs_pptr_info_sizeof(ppi->pi_ptrs_size)); + if (error) { + error = -EFAULT; + goto out; + } + +out: + kmem_free(ppi); + return error; +} + int xfs_ioc_swapext( xfs_swapext_t *sxp) @@ -1968,7 +2059,8 @@ xfs_file_ioctl( case XFS_IOC_FSGETXATTRA: return xfs_ioc_fsgetxattra(ip, arg); - + case XFS_IOC_GETPARENTS: + return xfs_ioc_get_parent_pointer(filp, arg); case XFS_IOC_GETBMAP: case XFS_IOC_GETBMAPA: case XFS_IOC_GETBMAPX: diff --git a/fs/xfs/xfs_ondisk.h b/fs/xfs/xfs_ondisk.h index 9737b5a9f405..6a6bd05c2a68 100644 --- a/fs/xfs/xfs_ondisk.h +++ b/fs/xfs/xfs_ondisk.h @@ -150,6 +150,10 @@ xfs_check_ondisk_structs(void) XFS_CHECK_OFFSET(struct xfs_efi_log_format_32, efi_extents, 16); XFS_CHECK_OFFSET(struct xfs_efi_log_format_64, efi_extents, 16); + /* parent pointer ioctls */ + XFS_CHECK_STRUCT_SIZE(struct xfs_parent_ptr, 280); + XFS_CHECK_STRUCT_SIZE(struct xfs_pptr_info, 104); + /* * The v5 superblock format extended several v4 header structures with * additional data. While new fields are only accessible on v5 diff --git a/fs/xfs/xfs_parent_utils.c b/fs/xfs/xfs_parent_utils.c new file mode 100644 index 000000000000..ea7890bd119a --- /dev/null +++ b/fs/xfs/xfs_parent_utils.c @@ -0,0 +1,124 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2022 Oracle, Inc. + * All rights reserved. + */ +#include "xfs.h" +#include "xfs_fs.h" +#include "xfs_format.h" +#include "xfs_log_format.h" +#include "xfs_shared.h" +#include "xfs_trans_resv.h" +#include "xfs_mount.h" +#include "xfs_bmap_btree.h" +#include "xfs_inode.h" +#include "xfs_error.h" +#include "xfs_trace.h" +#include "xfs_trans.h" +#include "xfs_da_format.h" +#include "xfs_da_btree.h" +#include "xfs_attr.h" +#include "xfs_ioctl.h" +#include "xfs_parent.h" +#include "xfs_da_btree.h" + +/* + * Get the parent pointers for a given inode + * + * Returns 0 on success and non zero on error + */ +int +xfs_attr_get_parent_pointer( + struct xfs_inode *ip, + struct xfs_pptr_info *ppi) +{ + + struct xfs_attrlist *alist; + struct xfs_attrlist_ent *aent; + struct xfs_parent_ptr *xpp; + struct xfs_parent_name_rec *xpnr; + char *namebuf; + unsigned int namebuf_size; + int name_len, i, error = 0; + unsigned int lock_mode, flags = XFS_ATTR_PARENT; + struct xfs_attr_list_context context; + + /* Allocate a buffer to store the attribute names */ + namebuf_size = sizeof(struct xfs_attrlist) + + (ppi->pi_ptrs_size) * sizeof(struct xfs_attrlist_ent); + namebuf = kvzalloc(namebuf_size, GFP_KERNEL); + if (!namebuf) + return -ENOMEM; + + memset(&context, 0, sizeof(struct xfs_attr_list_context)); + error = xfs_ioc_attr_list_context_init(ip, namebuf, namebuf_size, 0, + &context); + if (error) + goto out_kfree; + + /* Copy the cursor provided by caller */ + memcpy(&context.cursor, &ppi->pi_cursor, + sizeof(struct xfs_attrlist_cursor)); + context.attr_filter = XFS_ATTR_PARENT; + + lock_mode = xfs_ilock_attr_map_shared(ip); + + error = xfs_attr_list_ilocked(&context); + if (error) + goto out_kfree; + + alist = (struct xfs_attrlist *)namebuf; + for (i = 0; i < alist->al_count; i++) { + struct xfs_da_args args = { + .geo = ip->i_mount->m_attr_geo, + .whichfork = XFS_ATTR_FORK, + .dp = ip, + .namelen = sizeof(struct xfs_parent_name_rec), + .attr_filter = flags, + }; + + xpp = xfs_ppinfo_to_pp(ppi, i); + memset(xpp, 0, sizeof(struct xfs_parent_ptr)); + aent = (struct xfs_attrlist_ent *) + &namebuf[alist->al_offset[i]]; + xpnr = (struct xfs_parent_name_rec *)(aent->a_name); + + if (aent->a_valuelen > XFS_PPTR_MAXNAMELEN) { + error = -EFSCORRUPTED; + goto out_kfree; + } + name_len = aent->a_valuelen; + + args.name = (char *)xpnr; + args.hashval = xfs_da_hashname(args.name, args.namelen), + args.value = (unsigned char *)(xpp->xpp_name); + args.valuelen = name_len; + + error = xfs_attr_get_ilocked(&args); + error = (error == -EEXIST ? 0 : error); + if (error) { + error = -EFSCORRUPTED; + goto out_kfree; + } + + xfs_init_parent_ptr(xpp, xpnr); + if (!xfs_verify_ino(args.dp->i_mount, xpp->xpp_ino)) { + error = -EFSCORRUPTED; + goto out_kfree; + } + } + ppi->pi_ptrs_used = alist->al_count; + if (!alist->al_more) + ppi->pi_flags |= XFS_PPTR_OFLAG_DONE; + + /* Update the caller with the current cursor position */ + memcpy(&ppi->pi_cursor, &context.cursor, + sizeof(struct xfs_attrlist_cursor)); + +out_kfree: + xfs_iunlock(ip, lock_mode); + kvfree(namebuf); + + return error; +} + diff --git a/fs/xfs/xfs_parent_utils.h b/fs/xfs/xfs_parent_utils.h new file mode 100644 index 000000000000..ad60baee8b2a --- /dev/null +++ b/fs/xfs/xfs_parent_utils.h @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2022 Oracle, Inc. + * All rights reserved. + */ +#ifndef __XFS_PARENT_UTILS_H__ +#define __XFS_PARENT_UTILS_H__ + +int xfs_attr_get_parent_pointer(struct xfs_inode *ip, + struct xfs_pptr_info *ppi); +#endif /* __XFS_PARENT_UTILS_H__ */ From patchwork Mon Nov 7 09:01:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allison Henderson X-Patchwork-Id: 13034143 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E6E80C4332F for ; Mon, 7 Nov 2022 09:03:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231348AbiKGJDl (ORCPT ); Mon, 7 Nov 2022 04:03:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33974 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230363AbiKGJDi (ORCPT ); Mon, 7 Nov 2022 04:03:38 -0500 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 294FF12763 for ; Mon, 7 Nov 2022 01:03:38 -0800 (PST) Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 2A78v8q9032535 for ; Mon, 7 Nov 2022 09:03:38 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=0HDc5oSRZUZiwCZrUG1G6lMOEEvHfQHLGVwhC+kxeKs=; b=nz/6gyNDiZ8f55Y3KaE2JhWw4d0ccM5H5XCYG/o7FjpWhaDhcOyLDyBLHv9Q9TJA3rCY qh6Sr7gh8ZbZyJh5sj1lB0UxPk2WVAHd1I1Htbx/a1wGND5UWHGEGgVKQkwJiBLPFFmG z0Jfsx/J8ufRDeTVhHQDBzpjXFhLapWXZs2XyMB8T3YNEqZlcZD9vj5N5q3dyWpswXHb WYDTso9bi71Xax7OLxL3Rom0+ntqQQLGcSH/sMEYs90epwiaZqP2oNfA27R75Lfzgx5X yRfGHzmR/eyjzZ6CuUzhiaDNxX57EsrUK4nTMfngtpbPU+M8oFVpzKSnC5qKjscZpBo2 nQ== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3kngk6b7r1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:37 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2A77JXoC025146 for ; Mon, 7 Nov 2022 09:03:36 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2176.outbound.protection.outlook.com [104.47.59.176]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3kpcqek6ua-5 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:36 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ah/4h2v2pUSG+pTgZx+1dy+LwlVED49CLx3cdb97gIN+rnRwuioVkwH6im+XQ3g1hCl0bH2SmNBFwvbbE3u5oAOqZvaik/kj9dgFaAlhi4WHG0zIy+BZurrnftScj81KwmD7gCLVlzC2gfAHi5IkAEx2ckRMEk2oaL+MIrOVtPA0kbbTEfN+I5XuQvaqgLvtP5xainrIoqNMy2VleNBss/trv17sIE69qTwRnZNxodoeNAuobhvSfa1ERfU1Qtdfoi2mg5+6R4AhT0LV24ALNHocXuwUQ6rLbUkG8JJ/fOGmp+Azv9itlBKYslDIJyGEzUzsasWn5yu0uQbM+/l7QA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=0HDc5oSRZUZiwCZrUG1G6lMOEEvHfQHLGVwhC+kxeKs=; b=nNr1g3rH6ZSQI6NS6hKuOroHT5DnbWfKuRw5+Jz1Pkym6ZYZxee3ulZVGICsJeQHKSNgIV11OcX/27Y1EPivO+5kumGzxoaysvtnLXqYCJndI0g8u8q1N+xvwxsbXyPJOB23dUe9/3YX7PUTzny8vHu0AUDUcezPN12o9VIM48Ze6NX1zk2TrjCuyHyY0IoxR4eKYxvyvjV+sf5c2WcI2NiUAT4hIv5JDIMIi9bMyowYCoztKZHyqj5hDVdgVVihnSADdB39jhrZruhzREL/srEv3PATV2xJ5viwlDJMSBdLICahiitdoFdc9qsYX2G1VOZSkI2BiR1LVoy8Z5TbuQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0HDc5oSRZUZiwCZrUG1G6lMOEEvHfQHLGVwhC+kxeKs=; b=xm6bbglkESRqPC26d9EV+LpL5k9vmdp5Ep9g+5YNZEVp0xsV3wXT1gXZ7rhE/lT23s03b2tM5gLl+q7LhR8QF2gtF25NGRNlAUFn/A/9XEGQTKLWJ+y8p5AzLfg8drCzDf7Pd1UaHXgG2j0M0PbkqDks6rSObaB+vVCf6WPDpgE= Received: from BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) by MW4PR10MB6346.namprd10.prod.outlook.com (2603:10b6:303:1ec::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.26; Mon, 7 Nov 2022 09:03:32 +0000 Received: from BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3]) by BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3%4]) with mapi id 15.20.5791.026; Mon, 7 Nov 2022 09:03:32 +0000 From: allison.henderson@oracle.com To: linux-xfs@vger.kernel.org Subject: [PATCH v5 25/26] xfs: fix unit conversion error in xfs_log_calc_max_attrsetm_res Date: Mon, 7 Nov 2022 02:01:55 -0700 Message-Id: <20221107090156.299319-26-allison.henderson@oracle.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221107090156.299319-1-allison.henderson@oracle.com> References: <20221107090156.299319-1-allison.henderson@oracle.com> X-ClientProxiedBy: SJ0PR05CA0066.namprd05.prod.outlook.com (2603:10b6:a03:332::11) To BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB4306:EE_|MW4PR10MB6346:EE_ X-MS-Office365-Filtering-Correlation-Id: 5a673928-5bfd-4cff-aafc-08dac09ef1c3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uYCNa0dbQNYoRnfE3ExeO6jzD8TzRaM69gWihaI3ioQBvN2Zj7Z+5FK7HYJgV/C9RLyXEC4SEED+21of7ee2y+L+rzUJ+Po1RururFARrElwC3sRAwldDOV5WgI2d2PZ+vQvttAqILYjx+4xp5R82+TONKPOyDJ/DGfLyOxAqq2zWBJvl+XZHzJ7H92lR/wav/aGyS+OCJ1fPgImimo2E6b3E6DkZeJlqHiWBOID7maeO3v4exA9L5uzNke1vjYJL+XP6IeBvnZdIwhDWmFhcXQRrqRwbcU4HECFWGXE4VNQZmXYRgq4c71vwlwBh3ULOxNOu9XNVws+scY0IzDMkCbV8t/5xgNmRxPFmMvxPABp1tJCOCGHtgT+cUprqMffyH8nHjaIa80y5iBfkZVOTvIOef3H3nr40/WI+7fDxAF9+RxDGUhPJCSXkhM3O2RxtVswKxY4nlfydOLqfONAAo50BeutYXWoBzxIuyWwFkcFCJHQVU4/zxv57nEZ5tmuWNHYsGVZ9MS0d6szZOLWEG58uiSvQrPNHZXI5T7+RpzBFobhl7sKd0RkfWC5X0nasnLVdmchLMHKy/FaB1bkzhRzOZHGMQ6DeSjbVg5I2pm0Cre+tcgJAlEABy9MS6LbpC97rK1ewx/A6aHUEd0rqxt+2g67bImHRc3wipVxOzssLMRA7oCwrVOw7tIHee4rgGS+RFhYh/J2QcPRjIEGNA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB4306.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(366004)(136003)(396003)(376002)(39860400002)(346002)(451199015)(38100700002)(6506007)(36756003)(478600001)(316002)(66946007)(66556008)(8676002)(41300700001)(6916009)(8936002)(1076003)(5660300002)(6486002)(2906002)(86362001)(66476007)(83380400001)(2616005)(6666004)(9686003)(6512007)(26005)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Uu0uUEEwIdCPQ28PUAdXAhkZxowLRtqNqQ2iMlT9K2UuNmhBfQLZyq+7ad6bpVBAD5RbAtB8ti/L5VciyMaqfkYBg0Qp++fNT/wwHozkqSnTezX9NQuUoKkpguc7OnFklXxGpmrexCz2BxqxrpTPcACbfBe9kC1wPJZpkeK1TAuipeCGjhdfBEjIHZ1qOnc17BKwKcN39kueIIar5Sto/f3ap3Edo+Jf81TyHzvcX9hSCB5ZcHNKJ9TNO/HDBkvVxQ+YsZsZXrR1qNIuAenyZjLTXaC4R6tHTmxxxO7XvC9jhHFihePb/RoJnGv3i5mjOpom008EpxJ089uWNNHW3qx/MLO8o5jx4mk1eepmahf9/BtP7LPcV1PRUxbhv0eBAi9hu54L9cM2L9/8ek+UWjQeqgnMBTSglun7kJTTgXFW/BgC0PPy+JeUm05+DNEXi2aGn0snDBByGAbvEEpkZnut7pqU+dE+Zs5BFJDXW86Fwkki505iH/PQG+J4AIWp6gksfeeYyU6cUUlLhJ9Wuzd86c6QsIzA3GSfqwJk0p9JzlZQ0AMLZqu1i5y6p0+jEK9LbNoPHsQ7x5zfI4fBTqSs3g6wZ4nSA2ta6Q9cp2qzaG5LpT4Nt8pF479xNI+twAOqXS7r+f78Egcz8IVJL+A1xK5yGHb0XW5j4T3L9AB7fOiZPv0m62sioz7/Pd/a7AM4Q5TY0aRDXGjPPdMlJtvnsG7BEdzieDqR/8qCFitrH1kinKRRWe8W3sAIZLeIHWBjST7wa+H5CAq9fU2mXxG/HEtPzFCxU7SSaRHwu8aCYLgx91rDR651l5hv8xb0L9n7wXfRoqZ+PMdINK/Fx4Qyf4NwGYbt8ueBtOYpqTs9V8ojPxM0y73Iy8fmDnStYs/5p2+7VPS+hYDOHKj2KnMjXCIp2/c1Wjp8UC51WmmahhjsUNu1VWhXz+PnpEx55WOMvX1furDBaUeVlY9jDpjZEbrM3KnstseGlNBqjYlZuye2s2+e7CWcbAZCSNT6Npal3tzUsddFYxBqnJN2CzGUJgausm+IwZGiuye7eL60p6IfKuJPrHQWCafowEXzhP++82ih7x4+eMOgZY363MoO+QhjIWSabpgSqxvz7cD2fJD/1wMYxJuJWXzQFUf1Oa3GYV7Nl3tpEaRmhKpvPy522iq9tPYrjDWuvFEkY29VFCo+MGkt711+eZHaGnixACpGugQeCi4B2EzMQUXv3KT85ePdEY3pSWQr2Aygxms0P9iDDEhdRMaZQVNI13R+0ZZKkF6M7VjDhVWLyONXK588sxE2SGxFmJmBbyPOzpWu+1hmQ5Yk73SGdpa41NNvmr46bsQtSPvR/OuM1jHa+pGT6HU7c3T0pIqYbfVi4cva0Yu/kxjEWD1N4nDWT0QYIVWMHtiPgV+BliIbWB+JTlgktOTnYqlHooq6HwbYlOQF76mYRUxp7xInsIzJUFZBaoVeaIKCsXz/k9g0JrRH9XbB5bUBumRNdslzMazL55V5RP3T1boT1A85o+oFjVa1z0yPR/gP3+79w4s8+4VQi0HK6A37JBNgyWPG4ylPrHhh9U7WzkBT4Sidzr2GWcaE0idk/cBK7mYCl/RFan51Mg== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5a673928-5bfd-4cff-aafc-08dac09ef1c3 X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4306.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2022 09:03:32.0469 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: cl/iJrRJ+Qn79L54gTjbxaMkkiT7vpsBWrqVLyg68LipjAtCynHqlFaKX8CJ40e7Kswvev600EkZ0cdw34RDSeb3xSn/TV7d5wSTfzdVQY0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR10MB6346 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-07_02,2022-11-03_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0 mlxscore=0 suspectscore=0 spamscore=0 malwarescore=0 bulkscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2211070077 X-Proofpoint-ORIG-GUID: gbHiPlap2cpHADPkKRBDYk7cnkP3su6t X-Proofpoint-GUID: gbHiPlap2cpHADPkKRBDYk7cnkP3su6t Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Allison Henderson Dave and I were discussing some recent test regressions as a result of me turning on nrext64=1 on realtime filesystems, when we noticed that the minimum log size of a 32M filesystem jumped from 954 blocks to 4287 blocks. Digging through xfs_log_calc_max_attrsetm_res, Dave noticed that @size contains the maximum estimated amount of space needed for a local format xattr, in bytes, but we feed this quantity to XFS_NEXTENTADD_SPACE_RES, which requires units of blocks. This has resulted in an overestimation of the minimum log size over the years. We should nominally correct this, but there's a backwards compatibility problem -- if we enable it now, the minimum log size will decrease. If a corrected mkfs formats a filesystem with this new smaller log size, a user will encounter mount failures on an uncorrected kernel due to the larger minimum log size computations there. However, the large extent counters feature is still EXPERIMENTAL, so we can gate the correction on that feature (or any features that get added after that) being enabled. Any filesystem with nrext64 or any of the as-yet-undefined feature bits turned on will be rejected by old uncorrected kernels, so this should be safe even in the upgrade case. Signed-off-by: Darrick J. Wong Reviewed-by: Allison Henderson Signed-off-by: Allison Henderson --- fs/xfs/libxfs/xfs_log_rlimit.c | 43 ++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/fs/xfs/libxfs/xfs_log_rlimit.c b/fs/xfs/libxfs/xfs_log_rlimit.c index 9975b93a7412..e5c606fb7a6a 100644 --- a/fs/xfs/libxfs/xfs_log_rlimit.c +++ b/fs/xfs/libxfs/xfs_log_rlimit.c @@ -16,6 +16,39 @@ #include "xfs_bmap_btree.h" #include "xfs_trace.h" +/* + * Decide if the filesystem has the parent pointer feature or any feature + * added after that. + */ +static inline bool +xfs_has_parent_or_newer_feature( + struct xfs_mount *mp) +{ + if (!xfs_sb_is_v5(&mp->m_sb)) + return false; + + if (xfs_sb_has_compat_feature(&mp->m_sb, ~0)) + return true; + + if (xfs_sb_has_ro_compat_feature(&mp->m_sb, + ~(XFS_SB_FEAT_RO_COMPAT_FINOBT | + XFS_SB_FEAT_RO_COMPAT_RMAPBT | + XFS_SB_FEAT_RO_COMPAT_REFLINK | + XFS_SB_FEAT_RO_COMPAT_INOBTCNT))) + return true; + + if (xfs_sb_has_incompat_feature(&mp->m_sb, + ~(XFS_SB_FEAT_INCOMPAT_FTYPE | + XFS_SB_FEAT_INCOMPAT_SPINODES | + XFS_SB_FEAT_INCOMPAT_META_UUID | + XFS_SB_FEAT_INCOMPAT_BIGTIME | + XFS_SB_FEAT_INCOMPAT_NEEDSREPAIR | + XFS_SB_FEAT_INCOMPAT_NREXT64))) + return true; + + return false; +} + /* * Calculate the maximum length in bytes that would be required for a local * attribute value as large attributes out of line are not logged. @@ -31,6 +64,16 @@ xfs_log_calc_max_attrsetm_res( MAXNAMELEN - 1; nblks = XFS_DAENTER_SPACE_RES(mp, XFS_ATTR_FORK); nblks += XFS_B_TO_FSB(mp, size); + + /* + * Starting with the parent pointer feature, every new fs feature + * corrects a unit conversion error in the xattr transaction + * reservation code that resulted in oversized minimum log size + * computations. + */ + if (xfs_has_parent_or_newer_feature(mp)) + size = XFS_B_TO_FSB(mp, size); + nblks += XFS_NEXTENTADD_SPACE_RES(mp, size, XFS_ATTR_FORK); return M_RES(mp)->tr_attrsetm.tr_logres + From patchwork Mon Nov 7 09:01:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allison Henderson X-Patchwork-Id: 13034144 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00E26C43217 for ; Mon, 7 Nov 2022 09:03:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230460AbiKGJDn (ORCPT ); Mon, 7 Nov 2022 04:03:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231533AbiKGJDj (ORCPT ); Mon, 7 Nov 2022 04:03:39 -0500 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1F5EE95A6 for ; Mon, 7 Nov 2022 01:03:39 -0800 (PST) Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 2A78uatw012294 for ; Mon, 7 Nov 2022 09:03:39 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=QnZjoGgIcEUP40CqmQBJYUuAmBfobRJOlbitbtUwDrQ=; b=Bu38OFgM8RS/cTObyBKwSZ5GrJgfbQL6o2cmZr+gBZVo/DylRVh+H30LpuzB0SGgHoa9 aElgN1jODHJ0ohi9bn0EraNAoVZYy7nDjGdCwybIFlZY8BztPBcYaE0H7FRx7r9eVcNO m1VrlTTlZCAebtmYrGY52OraO42sRY9SvAG3WM+8a3OfWSlXPN/sUIJ7Z0BeEmSMC7+/ 5nScY+rafWTA0hu/wacn9JxPu+Al4KKgpJGuAhnQoCaRMekEOUvyXN4yr61Y9bkQsnOS ojxd0Yw/sYam+kEKJTwBWbvOS2RdTf0gEolbU5+Alb8Mm4Olz9JMBdsqX09c6V1VrNY2 XQ== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3kngkfu7v5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:38 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2A77JXoD025146 for ; Mon, 7 Nov 2022 09:03:36 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2176.outbound.protection.outlook.com [104.47.59.176]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3kpcqek6ua-6 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 09:03:36 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PwAHCvBLrFbouMwo/QJVbXbbl4hfS3kwm92S9IMGyTC8wzWNev780uTUhgeKwF+x0IeF6knPYuT5k54mEhjubcWHmCPsSt9LsfuG/CeAvJwt6B0r+05V20u/1Bj80X7qwIjbJkADQR9RkRqcKIhpYfpbCaoUgoKUXKp83BWfwnvS2XpZtcIg0gdF3gsztkbagxWIXIq9C6K8//ssz4iIdz2Zex1P1AbA653qQfvrZMVz771h+rnDhSJjzTUdwmocffrpcZGGz2sQg+wEz6LWr7cWAyOIcn12V0cwpacpoW4eiWykEY2YSEwSTQTdSNHd6+W79cYaxREyPxanOF4xUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=QnZjoGgIcEUP40CqmQBJYUuAmBfobRJOlbitbtUwDrQ=; b=Go3w9eJH3kmdnS42q6fpx6SRl27K5NhPasC8dummQYujQZyeVn3aBonVURuTvK+Fk2b8jOWqiCVUbZdzqhmJM1ONJ6y30O1fWAh8xXH02SCJjGB4pSqX8nh3BQPsRE9/i3/sEyQbNn8yAycX7fRlaw8EgO+KxQnRF+G4kWPm0EvNZj4gALM5wf4ShugG1ypEUdXy7pLLp1TdlDJKDNjuwWU+0nssX7WbRgmHq8OyGGY+nYMPnZEYExERJSUQpqvn1m0YpyT1bKPP5xzI57HzvEnV68zNCwkPLTOVGp+oAfTP++Bd7hVwIv2XBCSk9iEIcCcz+d7zEakVVYXppf/2KQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QnZjoGgIcEUP40CqmQBJYUuAmBfobRJOlbitbtUwDrQ=; b=YzuzvokvUwM0cgukQcebncUAAy+m7lAO7jIHUxaz1DXWvU9HGRwuqrzVaULoYPh590vCyKNwRzbu0z3y+6Tjn0ekWcOKJjxhTOHlmxWuapbDaN12d3DurV0Se5OiRaXCC9/MTzxU5Q3PFlP5XAZnxRJdXE/tn4yem0sZv24eyGo= Received: from BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) by MW4PR10MB6346.namprd10.prod.outlook.com (2603:10b6:303:1ec::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.26; Mon, 7 Nov 2022 09:03:33 +0000 Received: from BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3]) by BY5PR10MB4306.namprd10.prod.outlook.com ([fe80::c3f2:bf22:a83d:beb3%4]) with mapi id 15.20.5791.026; Mon, 7 Nov 2022 09:03:33 +0000 From: allison.henderson@oracle.com To: linux-xfs@vger.kernel.org Subject: [PATCH v5 26/26] xfs: drop compatibility minimum log size computations for reflink Date: Mon, 7 Nov 2022 02:01:56 -0700 Message-Id: <20221107090156.299319-27-allison.henderson@oracle.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221107090156.299319-1-allison.henderson@oracle.com> References: <20221107090156.299319-1-allison.henderson@oracle.com> X-ClientProxiedBy: SJ0PR05CA0159.namprd05.prod.outlook.com (2603:10b6:a03:339::14) To BY5PR10MB4306.namprd10.prod.outlook.com (2603:10b6:a03:211::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB4306:EE_|MW4PR10MB6346:EE_ X-MS-Office365-Filtering-Correlation-Id: dffd03b3-0b01-4d3b-0dfa-08dac09ef2d1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: D6hig/JA4hZ668NP04oeG0QFiYCchdECmP5I8YVOzrqexGo9EMLC8JAuP/Bc9CH3E8SL7vOB/xfUB+K6/mpsDraK/URPF9nlZeseCl8sLlL6GMpnx0Nii8GC9Nr038tHCNKqGKUvlkpFi8kvJbOqsTIpLey4WXMLqX2aUwAqcGxm59GUcMAkPP8I3Xio3oxSHy7yY+XoL2KiDo7TiNADPz7SyquzoNOZyjWcINtBo3yuuuRfv/bvCNhTtdXthSqcX+j1jioFbTjPrP+3hWQOs8UaNzwTW19nivdi4vg8hza7ogKyGMmTr/sMUTWf7NV/g+88iC70qGnIQYQDEWXMBYY9x+6OzTdnmIQ3gM2Jw4YhgDMUekYAk4Mx4tM5Z8X/pTYdH4XcaTRU5WfuDOr4OCV7euxa/5TzLr1T+otFFNDkf9KzUXeVOC+Hg5Y4lRIKMF8Yh2VR30sqVWBj9LITmPNZ/cg78FcGvLuWGJZSe1a2NEMbjn6k2CgfEoH+syOnl+gEnvyUPjsPmc4AhDdQHXqvibf1C8to16iN5S4cSQOd9xQPt/Newu9nPuRHH3LskGib1+Kz7iWwwv9wi4kI6Tc4TcFqogR7vYDCGBfDmY4XQp/NHgBtluVCdWzaxKT3jkLH3H21LhLWeZ/0t+iJBs2OrjgpFxsZfUkuk6PpeMyOShXjSu5LNV2IHTAqvWrVw/0tFj4d0RmdyoYLjzPHtA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB4306.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(366004)(136003)(396003)(376002)(39860400002)(346002)(451199015)(38100700002)(6506007)(36756003)(478600001)(316002)(66946007)(66556008)(8676002)(41300700001)(6916009)(8936002)(1076003)(5660300002)(6486002)(2906002)(86362001)(66476007)(83380400001)(2616005)(6666004)(9686003)(6512007)(26005)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8rndOCPlH5cs6eP2DTVkJRNzCnN7WgFFWyLVUufBO00xWWyBdMP29FJrQGbwd9fmSbhcuoIY1MD371tFjfS3MLq12zxAyhHFSKhB60kXdnK8FOvtiLppK1xnttm2H+UEUknW4RgP3xc2HQm33leiwt+lC6I+XJulAS0e4fwJ+UUehLxTo7+A/qlTT14dlthVR/9lDypkOGS5e024gPI5sOMS4EDfGejSNqPv7YFhehUD6rDZ6gbddRJ+jzwTYMBVjwpFgCk9Sj9sIv/GtvOexFw64TaBF/P2Eaem+RjFQ+3T+rKq2fFtrcJu43MqWLklFC3v6L4XKedrXLhF5jaWFw7swHa8zFKOPMzZ9pI3/UKczTCh2TBtNS10+mSDe4q7Ajrr27kxD1QFe3r2m7o6zGRB2Hw5vB/Xjku9LH20YYvRGIvVAPTE01PbfQo9hFDNC6HTD8c+KfPUs0oPzkk34wmy8gk0eTZYZKPYbEoGemJImAKr+aXQn89ECoABaTP0IdrLSmMLkzvbUEvB2IYjUBEhyjTYflJhT4l1pvqXP558/xhUlflr4NoBfPutjjiHKVQ+/l75EAhpVP2zIFs2NY5DhEwrYdd0AjRTvXtzOXRUQ6/o6d7NP2+iICCCMnLs3/zylcFzXhXREcVF7tK6JGFs6AsOKLC5TE8rmf/Cfe84dXxUyDV4LXmWWMAo1lbIa+AyE+FumRt8GdHU3pET/krZmj9lmx2ndBE4iji8Nhi6k8x5C76ptZ74NEmP5DCX96DcqtKz3sKJL+dMtBfV8wToDPTFbxbM4VGq24dM4e5mCbKkzGkE2wJlq1fdw9OE+2TY1x09zqY/QHW7fjcAgl/40N7UCRyo24kUMVBAIwMwPeoak+hmn/ZSO9SEuZrPTxcs+T3fpvjq61aFgkfKz1wqjV9JKe+48oe9PB+G5OpJI7jSHSBzkEt9Q3i5+stIsD3dLuvTarcUrtBGd0HCXuUyL1FMF7UJYzx5mSGqt9k8/uiZx5Lkkz17I2ju+/67qE9NXfacidQy7rVJopuNPC8p4LtHsWQxdx5m4mc2WUbHsOUVEzsDoUZ4fm3hneSEKARJwVRA9ywDFzJYpnMyyZOTZ2N9Hd8/r4nWjjn1L+28v78Q/jvOxchSEpXd0tRHjqwU93Ap1sSKkwCRjB0wXwmqz+TegX0fyjwufK1GoYBgYv20FQzQedEvaKhrXe4AXxCXA2xZeeDN0hijspzVLsDZ1jOfWZNwyWaqNqo4HI5J4SqgEZCbEdgvKgJq0UmE0VgQqrUdQwAzMarTdrCKYXOJL005OWCKb1Igsv9RRp1I7xjvJp4NctUXwHYT+MdBANjw7KvKV4gydoQo0PloyWvWuv0KbINr9Dt7ha237Q/IE7bwTjPTBGeLCW6qEbZVnMNhVl8tWI7edQwRjlPLd1TuF9VNrAT1BGKx+7BKtRRfaZCyGt69hxeOl2FjCIEwpYOxgsUM9DzrB1uzXmTK30nntV72GW4q05Kn3ENrUWp0CqcF+SmI3EDdqu2NCXP0Aw7AuZ5bRpqfsXinCVA9/SxxWbDyE0v+l8nk9YwYdbFn1pdgZyevcjoFDol7WJOS5lKTZ4jfvZiHDBf2x/cH+w== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: dffd03b3-0b01-4d3b-0dfa-08dac09ef2d1 X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4306.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2022 09:03:33.7967 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: dbAtuXWIGtWd6gUvfgvvSpKrxGYLsEg5R3BITlrhwarDb+A2M8IczCFl2zqPxZlYdUvqrMskKmzgBcyzvxjsAhtmmcB2bncJEWxXcNvh1nQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR10MB6346 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-07_02,2022-11-03_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0 mlxscore=0 suspectscore=0 spamscore=0 malwarescore=0 bulkscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2211070077 X-Proofpoint-ORIG-GUID: BmhvdDVRK8Wcxy9Jk1HePb4TZ8_gFxRI X-Proofpoint-GUID: BmhvdDVRK8Wcxy9Jk1HePb4TZ8_gFxRI Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Allison Henderson Having established that we can reduce the minimum log size computation for filesystems with parent pointers or any newer feature, we should also drop the compat minlogsize code that we added when we reduced the transaction reservation size for rmap and reflink. Signed-off-by: Darrick J. Wong Reviewed-by: Allison Henderson Signed-off-by: Allison Henderson --- fs/xfs/libxfs/xfs_log_rlimit.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/fs/xfs/libxfs/xfs_log_rlimit.c b/fs/xfs/libxfs/xfs_log_rlimit.c index e5c606fb7a6a..74821c7fd0cc 100644 --- a/fs/xfs/libxfs/xfs_log_rlimit.c +++ b/fs/xfs/libxfs/xfs_log_rlimit.c @@ -91,6 +91,16 @@ xfs_log_calc_trans_resv_for_minlogblocks( { unsigned int rmap_maxlevels = mp->m_rmap_maxlevels; + /* + * Starting with the parent pointer feature, every new fs feature + * drops the oversized minimum log size computation introduced by the + * original reflink code. + */ + if (xfs_has_parent_or_newer_feature(mp)) { + xfs_trans_resv_calc(mp, resv); + return; + } + /* * In the early days of rmap+reflink, we always set the rmap maxlevels * to 9 even if the AG was small enough that it would never grow to