All of lore.kernel.org
 help / color / mirror / Atom feed
From: Dave Chinner <david@fromorbit.com>
To: Christoph Hellwig <hch@lst.de>
Cc: xfs@oss.sgi.com
Subject: Re: [PATCH 11/21] implement generic xfs_btree_lookup
Date: Wed, 30 Jul 2008 14:59:37 +1000	[thread overview]
Message-ID: <20080730045937.GL13395@disturbed> (raw)
In-Reply-To: <20080729193104.GL19104@lst.de>

On Tue, Jul 29, 2008 at 09:31:04PM +0200, Christoph Hellwig wrote:
> From: Dave Chinner <dgc@sgi.com>
> 
> [hch: split out from bigger patch and minor adaptions]
> 
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
.....

> +
> +/*
> + * Get current search key.  For level 0 we don't actually have a key
> + * structure so we make one up from the record.  For all other levels
> + * we just return the right key.
> + */
> +STATIC union xfs_btree_key *
> +xfs_lookup_get_search_key(
> +	struct xfs_btree_cur	*cur,
> +	int			level,
> +	int			keyno,
> +	struct xfs_btree_block	*block,
> +	union xfs_btree_key	*kp)
> +{
> +	if (level == 0) {
> +		union xfs_btree_rec	*krp;
> +
> +		krp = cur->bc_ops->rec_addr(cur, keyno, block);
> +		cur->bc_ops->init_key_from_rec(cur, kp, krp);
> +		return kp;

I think the record pointer variable "krp" is confusing with "kp", the key
pointer. It's a record pointer; 'rp' it should be.

> +	/*
> +	 * Iterate over each level in the btree, starting at the root.
> +	 * For each level above the leaves, find the key we need, based
> +	 * on the lookup record, then follow the corresponding block
> +	 * pointer down to the next level.
> +	 */
> +	for (level = cur->bc_nlevels - 1, diff = 1; level >= 0; level--) {
> +		/* Get the block we need to do the lookup on. */
> +		error = xfs_btree_lookup_get_block(cur, level, pp, &block);
> +		if (error)
> +			goto error0;
> +
> +		/*
> +		 * If we already had a key match at a higher level, we know
> +		 * we need to use the first entry in this block.
> +		 */
> +		if (diff == 0)
> +			keyno = 1;
> +
> +		/* Otherwise search this block. Do a binary search. */
> +		else {

Can you make the {} consistent here ant move the comment for the
else? i.e.

		if (diff == 0) {
			keyno = 1;
		} else {
			/* Otherwise search this block. Do a binary search. */

> +			int	high;	/* high entry number */
> +			int	low;	/* low entry number */
> +
> +			/* Set low and high entry numbers, 1-based. */
> +			low = 1;
> +			high = xfs_btree_get_numrecs(block);
> +			if (!high) {
> +				/* Block is empty, must be an empty leaf. */
> +				ASSERT(level == 0 && cur->bc_nlevels == 1);
> +				cur->bc_ptrs[0] = dir != XFS_LOOKUP_LE;
> +				XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
> +				*stat = 0;
> +				return 0;
> +			}
> +			/* Binary search the block. */

Can we add a couple of empty lines there to break up that code a
bit?

			high = xfs_btree_get_numrecs(block);
			if (!high) {
				/* Block is empty, must be an empty leaf. */
				ASSERT(level == 0 && cur->bc_nlevels == 1);

				cur->bc_ptrs[0] = dir != XFS_LOOKUP_LE;
				XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
				*stat = 0;
				return 0;
			}

			/* Binary search the block. */

> +	/* Return if we succeeded or not. */
> +	if (keyno == 0 || keyno > xfs_btree_get_numrecs(block))
> +		*stat = 0;
> +	else
> +		*stat = ((dir != XFS_LOOKUP_EQ) || (diff == 0));

Can probably kill all the extra () in that.

> --- linux-2.6-xfs.orig/fs/xfs/xfs_alloc.c	2008-07-15 17:46:52.000000000 +0200
> +++ linux-2.6-xfs/fs/xfs/xfs_alloc.c	2008-07-15 17:51:41.000000000 +0200
> @@ -90,6 +90,54 @@ STATIC int xfs_alloc_ag_vextent_small(xf
>   */
>  
>  /*
> + * Lookup the record equal to [bno, len] in the btree given by cur.
> + */
> +STATIC int				/* error */
> +xfs_alloc_lookup_eq(

Should these be xfs_allocbt_lookup_*() to be consistent
with all the other allocbt functions (and inobt_lookup/bmbt_lookup)?

Otherwise look sane.

Cheers,

Dave.
-- 
Dave Chinner
david@fromorbit.com

  reply	other threads:[~2008-07-30  4:58 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-29 19:31 [PATCH 11/21] implement generic xfs_btree_lookup Christoph Hellwig
2008-07-30  4:59 ` Dave Chinner [this message]
2008-08-01 19:43   ` Christoph Hellwig
2008-08-02  1:14     ` Dave Chinner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080730045937.GL13395@disturbed \
    --to=david@fromorbit.com \
    --cc=hch@lst.de \
    --cc=xfs@oss.sgi.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.