Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83a8e6b2 authored by Allison Henderson's avatar Allison Henderson Committed by Greg Kroah-Hartman
Browse files

xfs: Add attibute remove and helper functions 



commit 068f985a9e5ec70fde58d8f679994fdbbd093a36 upstream.

This patch adds xfs_attr_remove_args. These sub-routines remove
the attributes specified in @args. We will use this later for setting
parent pointers as a deferred attribute operation.

Signed-off-by: default avatarAllison Henderson <allison.henderson@oracle.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent b21ff6cf

fs/xfs/libxfs/xfs_attr.c

+25 −11
Original line number Diff line number Diff line
@@ -289,6 +289,30 @@ xfs_attr_set_args( 
	return error;

}



/*

 * Remove the attribute specified in @args.

 */

int

xfs_attr_remove_args(

	struct xfs_da_args      *args)

{

	struct xfs_inode	*dp = args->dp;

	int			error;



	if (!xfs_inode_hasattr(dp)) {

		error = -ENOATTR;

	} else if (dp->i_d.di_aformat == XFS_DINODE_FMT_LOCAL) {

		ASSERT(dp->i_afp->if_flags & XFS_IFINLINE);

		error = xfs_attr_shortform_remove(args);

	} else if (xfs_bmap_one_block(dp, XFS_ATTR_FORK)) {

		error = xfs_attr_leaf_removename(args);

	} else {

		error = xfs_attr_node_removename(args);

	}



	return error;

}



int

xfs_attr_set(

	struct xfs_inode	*dp,
@@ -445,17 +469,7 @@ xfs_attr_remove( 
	 */

	xfs_trans_ijoin(args.trans, dp, 0);



	if (!xfs_inode_hasattr(dp)) {

		error = -ENOATTR;

	} else if (dp->i_d.di_aformat == XFS_DINODE_FMT_LOCAL) {

		ASSERT(dp->i_afp->if_flags & XFS_IFINLINE);

		error = xfs_attr_shortform_remove(&args);

	} else if (xfs_bmap_one_block(dp, XFS_ATTR_FORK)) {

		error = xfs_attr_leaf_removename(&args);

	} else {

		error = xfs_attr_node_removename(&args);

	}



	error = xfs_attr_remove_args(&args);

	if (error)

		goto out;

fs/xfs/libxfs/xfs_attr.h

+1 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ int xfs_attr_set(struct xfs_inode *dp, const unsigned char *name, 
		 unsigned char *value, int valuelen, int flags);

int xfs_attr_set_args(struct xfs_da_args *args, struct xfs_buf **leaf_bp);

int xfs_attr_remove(struct xfs_inode *dp, const unsigned char *name, int flags);

int xfs_attr_remove_args(struct xfs_da_args *args);

int xfs_attr_list(struct xfs_inode *dp, char *buffer, int bufsize,

		  int flags, struct attrlist_cursor_kern *cursor);