Commit 2b759eea authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba
Browse files

btrfs: send: directly return strcmp() result when comparing recorded refs 



There's no point in converting the return values from strcmp() as all we
need is that it returns a negative value if the first argument is less
than the second, a positive value if it's greater and 0 if equal. We do
not have a need for -1 instead of any other negative value and no need
for 1 instead of any other positive value - that's all that rb_find()
needs and no where else we need specific negative and positive values.

So remove the intermediate local variable and checks and return directly
the result from strcmp().

This also reduces the module's text size.

Before:

  $ size fs/btrfs/btrfs.ko
     text	   data	    bss	    dec	    hex	filename
  1888116	 161347	  16136	2065599	 1f84bf	fs/btrfs/btrfs.ko

After:

  $ size fs/btrfs/btrfs.ko
     text	   data	    bss	    dec	    hex	filename
  1888052	 161347	  16136	2065535	 1f847f	fs/btrfs/btrfs.ko

Reviewed-by: default avatarBoris Burkov <boris@bur.io>
Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Signed-off-by: default avatarFilipe Manana <fdmanana@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent e560afc1

fs/btrfs/send.c

+1 −7
Original line number Diff line number Diff line
@@ -4628,7 +4628,6 @@ static int rbtree_ref_comp(const void *k, const struct rb_node *node) 
{

	const struct recorded_ref *data = k;

	const struct recorded_ref *ref = rb_entry(node, struct recorded_ref, node);

	int result;



	if (data->dir > ref->dir)

		return 1;
@@ -4642,12 +4641,7 @@ static int rbtree_ref_comp(const void *k, const struct rb_node *node) 
		return 1;

	if (data->name_len < ref->name_len)

		return -1;

	result = strcmp(data->name, ref->name);

	if (result > 0)

		return 1;

	if (result < 0)

		return -1;

	return 0;

	return strcmp(data->name, ref->name);

}



static bool rbtree_ref_less(struct rb_node *node, const struct rb_node *parent)