Commit 6a178100 authored by Barry Naujok's avatar Barry Naujok Committed by Niv Sardi
Browse files

[XFS] Add op_flags field and helpers to xfs_da_args 



The end of the xfs_da_args structure has 4 unsigned char fields for
true/false information on directory and attr operations using the
xfs_da_args structure.

The following converts these 4 into a op_flags field that uses the first 4
bits for these fields and allows expansion for future operation
information (eg. case-insensitive lookup request).

SGI-PV: 981520
SGI-Modid: xfs-linux-melb:xfs-kern:31206a

Signed-off-by: default avatarBarry Naujok <bnaujok@sgi.com>
Signed-off-by: default avatarChristoph Hellwig <hch@infradead.org>
parent 5163f95a

fs/xfs/xfs_attr.c

+5 −6
Original line number Diff line number Diff line
@@ -241,8 +241,7 @@ xfs_attr_set_int(xfs_inode_t *dp, struct xfs_name *name, 
	args.firstblock = &firstblock;

	args.flist = &flist;

	args.whichfork = XFS_ATTR_FORK;

	args.addname = 1;

	args.oknoent = 1;

	args.op_flags = XFS_DA_OP_ADDNAME | XFS_DA_OP_OKNOENT;



	/*

	 * Determine space new attribute will use, and if it would be
@@ -974,7 +973,7 @@ xfs_attr_leaf_addname(xfs_da_args_t *args) 
			xfs_da_brelse(args->trans, bp);

			return(retval);

		}

		args->rename = 1;			/* an atomic rename */

		args->op_flags |= XFS_DA_OP_RENAME;	/* an atomic rename */

		args->blkno2 = args->blkno;		/* set 2nd entry info*/

		args->index2 = args->index;

		args->rmtblkno2 = args->rmtblkno;
@@ -1054,7 +1053,7 @@ xfs_attr_leaf_addname(xfs_da_args_t *args) 
	 * so that one disappears and one appears atomically.  Then we

	 * must remove the "old" attribute/value pair.

	 */

	if (args->rename) {

	if (args->op_flags & XFS_DA_OP_RENAME) {

		/*

		 * In a separate transaction, set the incomplete flag on the

		 * "old" attr and clear the incomplete flag on the "new" attr.
@@ -1307,7 +1306,7 @@ xfs_attr_node_addname(xfs_da_args_t *args) 
	} else if (retval == EEXIST) {

		if (args->flags & ATTR_CREATE)

			goto out;

		args->rename = 1;			/* atomic rename op */

		args->op_flags |= XFS_DA_OP_RENAME;	/* atomic rename op */

		args->blkno2 = args->blkno;		/* set 2nd entry info*/

		args->index2 = args->index;

		args->rmtblkno2 = args->rmtblkno;
@@ -1425,7 +1424,7 @@ xfs_attr_node_addname(xfs_da_args_t *args) 
	 * so that one disappears and one appears atomically.  Then we

	 * must remove the "old" attribute/value pair.

	 */

	if (args->rename) {

	if (args->op_flags & XFS_DA_OP_RENAME) {

		/*

		 * In a separate transaction, set the incomplete flag on the

		 * "old" attr and clear the incomplete flag on the "new" attr.

fs/xfs/xfs_attr_leaf.c

+11 −9
Original line number Diff line number Diff line
@@ -369,7 +369,8 @@ xfs_attr_shortform_remove(xfs_da_args_t *args) 
	 * Fix up the start offset of the attribute fork

	 */

	totsize -= size;

	if (totsize == sizeof(xfs_attr_sf_hdr_t) && !args->addname &&

	if (totsize == sizeof(xfs_attr_sf_hdr_t) &&

				!(args->op_flags & XFS_DA_OP_ADDNAME) &&

				(mp->m_flags & XFS_MOUNT_ATTR2) &&

				(dp->i_d.di_format != XFS_DINODE_FMT_BTREE)) {

		/*
@@ -389,7 +390,8 @@ xfs_attr_shortform_remove(xfs_da_args_t *args) 
		xfs_idata_realloc(dp, -size, XFS_ATTR_FORK);

		dp->i_d.di_forkoff = xfs_attr_shortform_bytesfit(dp, totsize);

		ASSERT(dp->i_d.di_forkoff);

		ASSERT(totsize > sizeof(xfs_attr_sf_hdr_t) || args->addname ||

		ASSERT(totsize > sizeof(xfs_attr_sf_hdr_t) ||

				(args->op_flags & XFS_DA_OP_ADDNAME) ||

				!(mp->m_flags & XFS_MOUNT_ATTR2) ||

				dp->i_d.di_format == XFS_DINODE_FMT_BTREE);

		dp->i_afp->if_ext_max =
@@ -531,7 +533,7 @@ xfs_attr_shortform_to_leaf(xfs_da_args_t *args) 
	nargs.total = args->total;

	nargs.whichfork = XFS_ATTR_FORK;

	nargs.trans = args->trans;

	nargs.oknoent = 1;

	nargs.op_flags = XFS_DA_OP_OKNOENT;



	sfe = &sf->list[0];

	for (i = 0; i < sf->hdr.count; i++) {
@@ -853,7 +855,7 @@ xfs_attr_leaf_to_shortform(xfs_dabuf_t *bp, xfs_da_args_t *args, int forkoff) 
	nargs.total = args->total;

	nargs.whichfork = XFS_ATTR_FORK;

	nargs.trans = args->trans;

	nargs.oknoent = 1;

	nargs.op_flags = XFS_DA_OP_OKNOENT;

	entry = &leaf->entries[0];

	for (i = 0; i < be16_to_cpu(leaf->hdr.count); entry++, i++) {

		if (entry->flags & XFS_ATTR_INCOMPLETE)
@@ -1155,7 +1157,7 @@ xfs_attr_leaf_add_work(xfs_dabuf_t *bp, xfs_da_args_t *args, int mapindex) 
	entry->hashval = cpu_to_be32(args->hashval);

	entry->flags = tmp ? XFS_ATTR_LOCAL : 0;

	entry->flags |= XFS_ATTR_NSP_ARGS_TO_ONDISK(args->flags);

	if (args->rename) {

	if (args->op_flags & XFS_DA_OP_RENAME) {

		entry->flags |= XFS_ATTR_INCOMPLETE;

		if ((args->blkno2 == args->blkno) &&

		    (args->index2 <= args->index)) {

fs/xfs/xfs_da_btree.c

+1 −1
Original line number Diff line number Diff line
@@ -1431,7 +1431,7 @@ xfs_da_path_shift(xfs_da_state_t *state, xfs_da_state_path_t *path, 
	}

	if (level < 0) {

		*result = XFS_ERROR(ENOENT);	/* we're out of our tree */

		ASSERT(args->oknoent);

		ASSERT(args->op_flags & XFS_DA_OP_OKNOENT);

		return(0);

	}

fs/xfs/xfs_da_btree.h

+9 −4
Original line number Diff line number Diff line
@@ -132,13 +132,18 @@ typedef struct xfs_da_args { 
	int		index2;		/* index of 2nd attr in blk */

	xfs_dablk_t	rmtblkno2;	/* remote attr value starting blkno */

	int		rmtblkcnt2;	/* remote attr value block count */

	unsigned char	justcheck;	/* T/F: check for ok with no space */

	unsigned char	rename;		/* T/F: this is an atomic rename op */

	unsigned char	addname;	/* T/F: this is an add operation */

	unsigned char	oknoent;	/* T/F: ok to return ENOENT, else die */

	int		op_flags;	/* operation flags */

	enum xfs_dacmp	cmpresult;	/* name compare result for lookups */

} xfs_da_args_t;



/*

 * Operation flags:

 */

#define XFS_DA_OP_JUSTCHECK	0x0001	/* check for ok with no space */

#define XFS_DA_OP_RENAME	0x0002	/* this is an atomic rename op */

#define XFS_DA_OP_ADDNAME	0x0004	/* this is an add operation */

#define XFS_DA_OP_OKNOENT	0x0008	/* lookup/add op, ENOENT ok, else die */



/*

 * Structure to describe buffer(s) for a block.

 * This is needed in the directory version 2 format case, when

fs/xfs/xfs_dir2.c

+8 −6
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ 


struct xfs_name xfs_name_dotdot = {"..", 2};



extern const struct xfs_nameops xfs_default_nameops;



void

xfs_dir_mount(

	xfs_mount_t	*mp)
@@ -173,8 +175,7 @@ xfs_dir_createname( 
	args.total = total;

	args.whichfork = XFS_DATA_FORK;

	args.trans = tp;

	args.justcheck = 0;

	args.addname = args.oknoent = 1;

	args.op_flags = XFS_DA_OP_ADDNAME | XFS_DA_OP_OKNOENT;



	if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL)

		rval = xfs_dir2_sf_addname(&args);
@@ -215,7 +216,7 @@ xfs_dir_lookup( 
	args.dp = dp;

	args.whichfork = XFS_DATA_FORK;

	args.trans = tp;

	args.oknoent = 1;

	args.op_flags = XFS_DA_OP_OKNOENT;

	args.cmpresult = XFS_CMP_DIFFERENT;



	if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL)
@@ -267,7 +268,7 @@ xfs_dir_removename( 
	args.total = total;

	args.whichfork = XFS_DATA_FORK;

	args.trans = tp;

	args.justcheck = args.addname = args.oknoent = 0;

	args.op_flags = 0;



	if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL)

		rval = xfs_dir2_sf_removename(&args);
@@ -350,7 +351,7 @@ xfs_dir_replace( 
	args.total = total;

	args.whichfork = XFS_DATA_FORK;

	args.trans = tp;

	args.justcheck = args.addname = args.oknoent = 0;

	args.op_flags = 0;



	if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL)

		rval = xfs_dir2_sf_replace(&args);
@@ -394,7 +395,8 @@ xfs_dir_canenter( 
	args.dp = dp;

	args.whichfork = XFS_DATA_FORK;

	args.trans = tp;

	args.justcheck = args.addname = args.oknoent = 1;

	args.op_flags = XFS_DA_OP_JUSTCHECK | XFS_DA_OP_ADDNAME |

							XFS_DA_OP_OKNOENT;



	if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL)

		rval = xfs_dir2_sf_addname(&args);