From 3361c7bebbf207f57f3dd1282cd87e1e37c082ac Mon Sep 17 00:00:00 2001 From: Jeffrey Layton Date: Tue, 8 May 2007 00:29:48 -0700 Subject: [PATCH] make iunique use a do/while loop rather than its obscure goto loop A while back, 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 Cc: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- fs/inode.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/fs/inode.c b/fs/inode.c index c03089421b6..81508b0a3a7 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -685,25 +685,21 @@ ino_t iunique(struct super_block *sb, ino_t max_reserved) { static ino_t counter; struct inode *inode; - struct hlist_head * head; + struct hlist_head *head; ino_t res; - spin_lock(&inode_lock); -retry: - if (counter > max_reserved) { - head = inode_hashtable + hash(sb,counter); - res = counter++; - inode = find_inode_fast(sb, head, res); - if (!inode) { - spin_unlock(&inode_lock); - return res; - } - } else { - counter = max_reserved + 1; - } - goto retry; - -} + spin_lock(&inode_lock); + do { + if (counter <= max_reserved) + counter = max_reserved + 1; + res = counter++; + head = inode_hashtable + hash(sb, res); + inode = find_inode_fast(sb, head, res); + } while (inode != NULL); + spin_unlock(&inode_lock); + + return res; +} EXPORT_SYMBOL(iunique); struct inode *igrab(struct inode *inode)