From patchwork Sun Jun 10 05:07:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allison Henderson X-Patchwork-Id: 10456533 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id F14E46020F for ; Sun, 10 Jun 2018 05:10:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E171F20700 for ; Sun, 10 Jun 2018 05:10:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D60EB25D99; Sun, 10 Jun 2018 05:10:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 66BE820700 for ; Sun, 10 Jun 2018 05:10:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753708AbeFJFKM (ORCPT ); Sun, 10 Jun 2018 01:10:12 -0400 Received: from userp2120.oracle.com ([156.151.31.85]:33926 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753714AbeFJFKK (ORCPT ); Sun, 10 Jun 2018 01:10:10 -0400 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w5A59HSc096061 for ; Sun, 10 Jun 2018 05:10: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; s=corp-2017-10-26; bh=XhTWZKO/mIOE1GtMJXQkHSFuni9/t1FAqO6y9bxuHfE=; b=L8+W948JjDpW76YeItQMwJX3NYm8MGxBre9Q6PAwAzipJwKNw+Wdl7J2fM2sT1jWQDFZ LCHrarwCTIaMykLJhcSXKjvLT9g8oWnj8rf+fWJQJvvMcjZPbYr6xb+JM4Gzg8YTUbiC P3FVctu6/IwIrkTxrI/1X2/V3Pv8tsfqaHRtjMKR2be8iZwPYF31Jma9ilDtf668IjJm h2OlkMtxmmH7I6vHfoOEMiUmiaEWurjz2y10zQSaRnpDuZJ6D5VtxvuK5wPStlVbeK92 iMn/7Lh0G6apyR7PUMVDZ/sVxcFICsVCV95pfPVk9JtcV3z8mTH1r+AKejbnXVfxF1mF rA== Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp2120.oracle.com with ESMTP id 2jg7hwstcx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sun, 10 Jun 2018 05:10:09 +0000 Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w5A5A8AF004449 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sun, 10 Jun 2018 05:10:08 GMT Received: from abhmp0018.oracle.com (abhmp0018.oracle.com [141.146.116.24]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id w5A5A8DR003794 for ; Sun, 10 Jun 2018 05:10:08 GMT Received: from localhost.localdomain (/72.210.40.165) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Sat, 09 Jun 2018 22:10:08 -0700 From: Allison Henderson To: linux-xfs@vger.kernel.org Subject: [PATCH v2 07/27] xfsprogs: Add xfs_attr_set_deferred and xfs_attr_remove_deferred Date: Sat, 9 Jun 2018 22:07:32 -0700 Message-Id: <1528607272-11122-8-git-send-email-allison.henderson@oracle.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1528607272-11122-1-git-send-email-allison.henderson@oracle.com> References: <1528607272-11122-1-git-send-email-allison.henderson@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8919 signatures=668702 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1805220000 definitions=main-1806100059 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP These routines set up set and start a new deferred attribute operation. These functions are meant to be called by other code needing to initiate a deferred attribute operation. We will use these routines later in the parent pointer patches. Signed-off-by: Allison Henderson --- libxfs/xfs_attr.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ libxfs/xfs_attr.h | 5 ++++ 2 files changed, 78 insertions(+) diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c index e894468..fae5c9a 100644 --- a/libxfs/xfs_attr.c +++ b/libxfs/xfs_attr.c @@ -37,6 +37,7 @@ #include "xfs_trans_space.h" #include "xfs_trace.h" #include "xfs_attr_item.h" +#include "xfs_attr.h" /* * xfs_attr.c @@ -472,6 +473,44 @@ out_defer_cancel: return error; } +/* Sets an attribute for an inode as a deferred operation */ +int +xfs_attr_set_deferred( + struct xfs_inode *dp, + struct xfs_defer_ops *dfops, + void *name, + unsigned int namelen, + void *value, + unsigned int valuelen, + int flags) +{ + + struct xfs_attr_item *new; + char *name_value; + + if (!namelen || !valuelen) { + ASSERT(0); + return -EFSCORRUPTED; + } + + new = kmem_alloc(XFS_ATTR_ITEM_SIZEOF(namelen, valuelen), + KM_SLEEP|KM_NOFS); + name_value = ((char *)new) + sizeof(struct xfs_attr_item); + memset(new, 0, XFS_ATTR_ITEM_SIZEOF(namelen, valuelen)); + new->xattri_ip = dp; + new->xattri_op_flags = XFS_ATTR_OP_FLAGS_SET; + new->xattri_name_len = namelen; + new->xattri_value_len = valuelen; + new->xattri_flags = flags; + memcpy(&name_value[0], name, namelen); + memcpy(&name_value[namelen], value, valuelen); + + xfs_defer_ijoin(dfops, dp); + xfs_defer_add(dfops, XFS_DEFER_OPS_TYPE_ATTR, &new->xattri_list); + + return 0; +} + /* * Generic handler routine to remove a name from an attribute list. * Transitions attribute list from Btree to shortform as necessary. @@ -560,6 +599,40 @@ out: return error; } +/* Removes an attribute for an inode as a deferred operation */ +int +xfs_attr_remove_deferred( + struct xfs_inode *dp, + struct xfs_defer_ops *dfops, + void *name, + unsigned int namelen, + int flags) +{ + + struct xfs_attr_item *new; + char *name_value; + + if (!namelen) { + ASSERT(0); + return -EFSCORRUPTED; + } + + new = kmem_alloc(XFS_ATTR_ITEM_SIZEOF(namelen, 0), KM_SLEEP|KM_NOFS); + name_value = ((char *)new) + sizeof(struct xfs_attr_item); + memset(new, 0, XFS_ATTR_ITEM_SIZEOF(namelen, 0)); + new->xattri_ip = dp; + new->xattri_op_flags = XFS_ATTR_OP_FLAGS_REMOVE; + new->xattri_name_len = namelen; + new->xattri_value_len = 0; + new->xattri_flags = flags; + memcpy(name_value, name, namelen); + + xfs_defer_ijoin(dfops, dp); + xfs_defer_add(dfops, XFS_DEFER_OPS_TYPE_ATTR, &new->xattri_list); + + return 0; +} + /*======================================================================== * External routines when attribute list is inside the inode *========================================================================*/ diff --git a/libxfs/xfs_attr.h b/libxfs/xfs_attr.h index eebfad7..c706976 100644 --- a/libxfs/xfs_attr.h +++ b/libxfs/xfs_attr.h @@ -178,5 +178,10 @@ int xfs_attr_list(struct xfs_inode *dp, char *buffer, int bufsize, int xfs_attr_args_init(struct xfs_da_args *args, struct xfs_inode *dp, const unsigned char *name, int flags); int xfs_attr_calc_size(struct xfs_da_args *args, int *local); +int xfs_attr_set_deferred(struct xfs_inode *dp, struct xfs_defer_ops *dfops, + void *name, unsigned int name_len, void *value, + unsigned int valuelen, int flags); +int xfs_attr_remove_deferred(struct xfs_inode *dp, struct xfs_defer_ops *dfops, + void *name, unsigned int namelen, int flags); #endif /* __XFS_ATTR_H__ */