Commit f3e93d95 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: clean up the ATTR_REPLACE checks 



Remove superflous braces, elses after return statements and use a goto
label to merge common error handling.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarChandan Rajendra <chandanrlinux@gmail.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 5a3930e2

fs/xfs/libxfs/xfs_attr.c

+12 −12
Original line number Diff line number Diff line
@@ -423,9 +423,9 @@ xfs_attr_shortform_addname(xfs_da_args_t *args) 
	trace_xfs_attr_sf_addname(args);



	retval = xfs_attr_shortform_lookup(args);

	if ((args->flags & ATTR_REPLACE) && (retval == -ENOATTR)) {

	if (retval == -ENOATTR && (args->flags & ATTR_REPLACE))

		return retval;

	} else if (retval == -EEXIST) {

	if (retval == -EEXIST) {

		if (args->flags & ATTR_CREATE)

			return retval;

		retval = xfs_attr_shortform_remove(args);
@@ -489,14 +489,11 @@ xfs_attr_leaf_addname( 
	 * the given flags produce an error or call for an atomic rename.

	 */

	retval = xfs_attr3_leaf_lookup_int(bp, args);

	if ((args->flags & ATTR_REPLACE) && (retval == -ENOATTR)) {

		xfs_trans_brelse(args->trans, bp);

		return retval;

	} else if (retval == -EEXIST) {

		if (args->flags & ATTR_CREATE) {	/* pure create op */

			xfs_trans_brelse(args->trans, bp);

			return retval;

		}

	if (retval == -ENOATTR && (args->flags & ATTR_REPLACE))

		goto out_brelse;

	if (retval == -EEXIST) {

		if (args->flags & ATTR_CREATE)	/* pure create op */

			goto out_brelse;



		trace_xfs_attr_leaf_replace(args);
@@ -637,6 +634,9 @@ xfs_attr_leaf_addname( 
		error = xfs_attr3_leaf_clearflag(args);

	}

	return error;

out_brelse:

	xfs_trans_brelse(args->trans, bp);

	return retval;

}



/*
@@ -763,9 +763,9 @@ xfs_attr_node_addname( 
		goto out;

	blk = &state->path.blk[ state->path.active-1 ];

	ASSERT(blk->magic == XFS_ATTR_LEAF_MAGIC);

	if ((args->flags & ATTR_REPLACE) && (retval == -ENOATTR)) {

	if (retval == -ENOATTR && (args->flags & ATTR_REPLACE))

		goto out;

	} else if (retval == -EEXIST) {

	if (retval == -EEXIST) {

		if (args->flags & ATTR_CREATE)

			goto out;