From d7644000a7490dda8967e48c001d5d8a4510f545 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Wed, 27 Feb 2013 17:03:51 -0800
Subject: [PATCH] --- yaml --- r: 359319 b: refs/heads/master c:
 4106ecaf59b79efff3f9b466baf9e8c67e19ac5a h: refs/heads/master i:   359317:
 b6fde0c5fa22ac194be361ba0138d3c3863ee34c   359315:
 83a77efcaa02b92f738b1ee4b1b14f304d237195   359311:
 ee26a64867369318adfca4aedff620bade57defd v: v3

---
 [refs]                    |  2 +-
 trunk/include/linux/idr.h | 28 ++++++++++++----------------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 5e21ea9cf0af..27a95dedef41 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe6e24ec90b753392c3f9ec1fbca196c4e88e511
+refs/heads/master: 4106ecaf59b79efff3f9b466baf9e8c67e19ac5a
diff --git a/trunk/include/linux/idr.h b/trunk/include/linux/idr.h
index 4cf042da3892..8f4980db3524 100644
--- a/trunk/include/linux/idr.h
+++ b/trunk/include/linux/idr.h
@@ -49,28 +49,24 @@
 #define MAX_IDR_FREE (MAX_IDR_LEVEL * 2)
 
 struct idr_layer {
-	unsigned long		 bitmap; /* A zero bit means "space here" */
+	unsigned long		bitmap;	/* A zero bit means "space here" */
 	struct idr_layer __rcu	*ary[1<<IDR_BITS];
-	int			 count;	 /* When zero, we can release it */
-	int			 layer;	 /* distance from leaf */
-	struct rcu_head		 rcu_head;
+	int			count;	/* When zero, we can release it */
+	int			layer;	/* distance from leaf */
+	struct rcu_head		rcu_head;
 };
 
 struct idr {
-	struct idr_layer __rcu *top;
-	struct idr_layer *id_free;
-	int		  layers; /* only valid without concurrent changes */
-	int		  id_free_cnt;
-	spinlock_t	  lock;
+	struct idr_layer __rcu	*top;
+	struct idr_layer	*id_free;
+	int			layers;	/* only valid w/o concurrent changes */
+	int			id_free_cnt;
+	spinlock_t		lock;
 };
 
-#define IDR_INIT(name)						\
-{								\
-	.top		= NULL,					\
-	.id_free	= NULL,					\
-	.layers 	= 0,					\
-	.id_free_cnt	= 0,					\
-	.lock		= __SPIN_LOCK_UNLOCKED(name.lock),	\
+#define IDR_INIT(name)							\
+{									\
+	.lock			= __SPIN_LOCK_UNLOCKED(name.lock),	\
 }
 #define DEFINE_IDR(name)	struct idr name = IDR_INIT(name)