Re: [PATCH] make iunique use a do/while loop rather than its obscure goto loop

From: Christoph Hellwig
Date: Wed Jan 31 2007 - 03:17:09 EST


On Tue, Jan 30, 2007 at 10:45:54AM -0500, Jeffrey Layton wrote:
> While working on a case, Christoph mentioned that he thought that iunique
> ought to be cleaned up to use a more conventional loop construct. This patch
> does that, turning the strange goto loop into a do/while.
>
> Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
>
> diff --git a/fs/inode.c b/fs/inode.c
> index 23fc1fd..90e7587 100644
> --- a/fs/inode.c
> +++ b/fs/inode.c
> @@ -689,21 +689,18 @@ ino_t iunique(struct super_block *sb, ino_t max_reserved)
> struct inode *inode;
> struct hlist_head * head;
> ino_t res;
> +
> spin_lock(&inode_lock);
> -retry:
> - if (counter > max_reserved) {
> - head = inode_hashtable + hash(sb,counter);
> + do {
> + if (counter <= max_reserved)
> + counter = max_reserved + 1;
> res = counter++;
> + head = inode_hashtable + hash(sb, res);
> inode = find_inode_fast(sb, head, res);
> - if (!inode) {
> - spin_unlock(&inode_lock);
> - return res;
> - }
> - } else {
> - counter = max_reserved + 1;
> - }
> - goto retry;
> -
> + } while (inode != NULL);
> + spin_unlock(&inode_lock);
> +
> + return res;

Looks good, thanks
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/