Merge branch 'akpm' (final batch from Andrew)

Merge third patch-bumb from Andrew Morton:
 "This wraps me up for -rc1.
   - Lots of misc stuff and things which were deferred/missed from
     patchbombings 1 & 2.
   - ocfs2 things
   - lib/scatterlist
   - hfsplus
   - fatfs
   - documentation
   - signals
   - procfs
   - lockdep
   - coredump
   - seqfile core
   - kexec
   - Tejun's large IDR tree reworkings
   - ipmi
   - partitions
   - nbd
   - random() things
   - kfifo
   - tools/testing/selftests updates
   - Sasha's large and pointless hlist cleanup"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (163 commits)
  hlist: drop the node parameter from iterators
  kcmp: make it depend on CHECKPOINT_RESTORE
  selftests: add a simple doc
  tools/testing/selftests/Makefile: rearrange targets
  selftests/efivarfs: add create-read test
  selftests/efivarfs: add empty file creation test
  selftests: add tests for efivarfs
  kfifo: fix kfifo_alloc() and kfifo_init()
  kfifo: move kfifo.c from kernel/ to lib/
  arch Kconfig: centralise CONFIG_ARCH_NO_VIRT_TO_BUS
  w1: add support for DS2413 Dual Channel Addressable Switch
  memstick: move the dereference below the NULL test
  drivers/pps/clients/pps-gpio.c: use devm_kzalloc
  Documentation/DMA-API-HOWTO.txt: fix typo
  include/linux/eventfd.h: fix incorrect filename is a comment
  mtd: mtd_stresstest: use prandom_bytes()
  mtd: mtd_subpagetest: convert to use prandom library
  mtd: mtd_speedtest: use prandom_bytes
  mtd: mtd_pagetest: convert to use prandom library
  mtd: mtd_oobtest: convert to use prandom library
  ...

13 files changed, 58 insertions, 146 deletions

diff --git a/drivers/gpu/drm/drm_context.c b/drivers/gpu/drm/drm_context.c
index 45adf97e678f..725968d38976 100644
--- a/drivers/gpu/drm/drm_context.c
+++ b/drivers/gpu/drm/drm_context.c
@@ -74,24 +74,13 @@ void drm_ctxbitmap_free(struct drm_device * dev, int ctx_handle)
  */
 static int drm_ctxbitmap_next(struct drm_device * dev)
 {
-        int new_id;
         int ret;
 
-again:
-        if (idr_pre_get(&dev->ctx_idr, GFP_KERNEL) == 0) {
-                DRM_ERROR("Out of memory expanding drawable idr\n");
-                return -ENOMEM;
-        }
         mutex_lock(&dev->struct_mutex);
-        ret = idr_get_new_above(&dev->ctx_idr, NULL,
-                                DRM_RESERVED_CONTEXTS, &new_id);
+        ret = idr_alloc(&dev->ctx_idr, NULL, DRM_RESERVED_CONTEXTS, 0,
+                        GFP_KERNEL);
         mutex_unlock(&dev->struct_mutex);
-        if (ret == -EAGAIN)
-                goto again;
-        else if (ret)
-                return ret;
-
-        return new_id;
+        return ret;
 }
 
 /**
@@ -118,7 +107,7 @@ int drm_ctxbitmap_init(struct drm_device * dev)
 void drm_ctxbitmap_cleanup(struct drm_device * dev)
 {
         mutex_lock(&dev->struct_mutex);
-        idr_remove_all(&dev->ctx_idr);
+        idr_destroy(&dev->ctx_idr);
         mutex_unlock(&dev->struct_mutex);
 }
 
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 3bdf2a650d9c..792c3e3795ca 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -266,32 +266,21 @@ char *drm_get_connector_status_name(enum drm_connector_status status)
 static int drm_mode_object_get(struct drm_device *dev,
                                struct drm_mode_object *obj, uint32_t obj_type)
 {
-        int new_id = 0;
         int ret;
 
-again:
-        if (idr_pre_get(&dev->mode_config.crtc_idr, GFP_KERNEL) == 0) {
-                DRM_ERROR("Ran out memory getting a mode number\n");
-                return -ENOMEM;
-        }
-
         mutex_lock(&dev->mode_config.idr_mutex);
-        ret = idr_get_new_above(&dev->mode_config.crtc_idr, obj, 1, &new_id);
-
-        if (!ret) {
+        ret = idr_alloc(&dev->mode_config.crtc_idr, obj, 1, 0, GFP_KERNEL);
+        if (ret >= 0) {
                 /*
                  * Set up the object linking under the protection of the idr
                  * lock so that other users can't see inconsistent state.
                  */
-                obj->id = new_id;
+                obj->id = ret;
                 obj->type = obj_type;
         }
         mutex_unlock(&dev->mode_config.idr_mutex);
 
-        if (ret == -EAGAIN)
-                goto again;
-
-        return ret;
+        return ret < 0 ? ret : 0;
 }
 
 /**
@@ -1272,7 +1261,6 @@ void drm_mode_config_cleanup(struct drm_device *dev)
                 crtc->funcs->destroy(crtc);
         }
 
-        idr_remove_all(&dev->mode_config.crtc_idr);
         idr_destroy(&dev->mode_config.crtc_idr);
 }
 EXPORT_SYMBOL(drm_mode_config_cleanup);
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index be174cab105a..25f91cd23e60 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -297,7 +297,6 @@ static void __exit drm_core_exit(void)
 
         unregister_chrdev(DRM_MAJOR, "drm");
 
-        idr_remove_all(&drm_minors_idr);
         idr_destroy(&drm_minors_idr);
 }
 
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index 24efae464e2c..af779ae19ebf 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -270,21 +270,19 @@ drm_gem_handle_create(struct drm_file *file_priv,
         int ret;
 
         /*
-         * Get the user-visible handle using idr.
+         * Get the user-visible handle using idr.  Preload and perform
+         * allocation under our spinlock.
          */
-again:
-        /* ensure there is space available to allocate a handle */
-        if (idr_pre_get(&file_priv->object_idr, GFP_KERNEL) == 0)
-                return -ENOMEM;
-
-        /* do the allocation under our spinlock */
+        idr_preload(GFP_KERNEL);
         spin_lock(&file_priv->table_lock);
-        ret = idr_get_new_above(&file_priv->object_idr, obj, 1, (int *)handlep);
+
+        ret = idr_alloc(&file_priv->object_idr, obj, 1, 0, GFP_NOWAIT);
+
         spin_unlock(&file_priv->table_lock);
-        if (ret == -EAGAIN)
-                goto again;
-        else if (ret)
+        idr_preload_end();
+        if (ret < 0)
                 return ret;
+        *handlep = ret;
 
         drm_gem_object_handle_reference(obj);
 
@@ -451,29 +449,25 @@ drm_gem_flink_ioctl(struct drm_device *dev, void *data,
         if (obj == NULL)
                 return -ENOENT;
 
-again:
-        if (idr_pre_get(&dev->object_name_idr, GFP_KERNEL) == 0) {
-                ret = -ENOMEM;
-                goto err;
-        }
-
+        idr_preload(GFP_KERNEL);
         spin_lock(&dev->object_name_lock);
         if (!obj->name) {
-                ret = idr_get_new_above(&dev->object_name_idr, obj, 1,
-                                        &obj->name);
+                ret = idr_alloc(&dev->object_name_idr, obj, 1, 0, GFP_NOWAIT);
+                obj->name = ret;
                 args->name = (uint64_t) obj->name;
                 spin_unlock(&dev->object_name_lock);
+                idr_preload_end();
 
-                if (ret == -EAGAIN)
-                        goto again;
-                else if (ret)
+                if (ret < 0)
                         goto err;
+                ret = 0;
 
                 /* Allocate a reference for the name table.  */
                 drm_gem_object_reference(obj);
         } else {
                 args->name = (uint64_t) obj->name;
                 spin_unlock(&dev->object_name_lock);
+                idr_preload_end();
                 ret = 0;
         }
 
@@ -561,8 +555,6 @@ drm_gem_release(struct drm_device *dev, struct drm_file *file_private)
 {
         idr_for_each(&file_private->object_idr,
                      &drm_gem_object_release_handle, file_private);
-
-        idr_remove_all(&file_private->object_idr);
         idr_destroy(&file_private->object_idr);
 }
 
diff --git a/drivers/gpu/drm/drm_hashtab.c b/drivers/gpu/drm/drm_hashtab.c
index 80254547a3f8..7e4bae760e27 100644
--- a/drivers/gpu/drm/drm_hashtab.c
+++ b/drivers/gpu/drm/drm_hashtab.c
@@ -60,14 +60,13 @@ void drm_ht_verbose_list(struct drm_open_hash *ht, unsigned long key)
 {
         struct drm_hash_item *entry;
         struct hlist_head *h_list;
-        struct hlist_node *list;
         unsigned int hashed_key;
         int count = 0;
 
         hashed_key = hash_long(key, ht->order);
         DRM_DEBUG("Key is 0x%08lx, Hashed key is 0x%08x\n", key, hashed_key);
         h_list = &ht->table[hashed_key];
-        hlist_for_each_entry(entry, list, h_list, head)
+        hlist_for_each_entry(entry, h_list, head)
                 DRM_DEBUG("count %d, key: 0x%08lx\n", count++, entry->key);
 }
 
@@ -76,14 +75,13 @@ static struct hlist_node *drm_ht_find_key(struct drm_open_hash *ht,
 {
         struct drm_hash_item *entry;
         struct hlist_head *h_list;
-        struct hlist_node *list;
         unsigned int hashed_key;
 
         hashed_key = hash_long(key, ht->order);
         h_list = &ht->table[hashed_key];
-        hlist_for_each_entry(entry, list, h_list, head) {
+        hlist_for_each_entry(entry, h_list, head) {
                 if (entry->key == key)
-                        return list;
+                        return &entry->head;
                 if (entry->key > key)
                         break;
         }
@@ -95,14 +93,13 @@ static struct hlist_node *drm_ht_find_key_rcu(struct drm_open_hash *ht,
 {
         struct drm_hash_item *entry;
         struct hlist_head *h_list;
-        struct hlist_node *list;
         unsigned int hashed_key;
 
         hashed_key = hash_long(key, ht->order);
         h_list = &ht->table[hashed_key];
-        hlist_for_each_entry_rcu(entry, list, h_list, head) {
+        hlist_for_each_entry_rcu(entry, h_list, head) {
                 if (entry->key == key)
-                        return list;
+                        return &entry->head;
                 if (entry->key > key)
                         break;
         }
@@ -113,19 +110,19 @@ int drm_ht_insert_item(struct drm_open_hash *ht, struct drm_hash_item *item)
 {
         struct drm_hash_item *entry;
         struct hlist_head *h_list;
-        struct hlist_node *list, *parent;
+        struct hlist_node *parent;
         unsigned int hashed_key;
         unsigned long key = item->key;
 
         hashed_key = hash_long(key, ht->order);
         h_list = &ht->table[hashed_key];
         parent = NULL;
-        hlist_for_each_entry(entry, list, h_list, head) {
+        hlist_for_each_entry(entry, h_list, head) {
                 if (entry->key == key)
                         return -EINVAL;
                 if (entry->key > key)
                         break;
-                parent = list;
+                parent = &entry->head;
         }
         if (parent) {
                 hlist_add_after_rcu(parent, &item->head);
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
index 200e104f1fa0..7d30802a018f 100644
--- a/drivers/gpu/drm/drm_stub.c
+++ b/drivers/gpu/drm/drm_stub.c
@@ -109,7 +109,6 @@ EXPORT_SYMBOL(drm_ut_debug_printk);
 
 static int drm_minor_get_id(struct drm_device *dev, int type)
 {
-        int new_id;
         int ret;
         int base = 0, limit = 63;
 
@@ -121,25 +120,11 @@ static int drm_minor_get_id(struct drm_device *dev, int type)
                 limit = base + 255;
         }
 
-again:
-        if (idr_pre_get(&drm_minors_idr, GFP_KERNEL) == 0) {
-                DRM_ERROR("Out of memory expanding drawable idr\n");
-                return -ENOMEM;
-        }
         mutex_lock(&dev->struct_mutex);
-        ret = idr_get_new_above(&drm_minors_idr, NULL,
-                                base, &new_id);
+        ret = idr_alloc(&drm_minors_idr, NULL, base, limit, GFP_KERNEL);
         mutex_unlock(&dev->struct_mutex);
-        if (ret == -EAGAIN)
-                goto again;
-        else if (ret)
-                return ret;
 
-        if (new_id >= limit) {
-                idr_remove(&drm_minors_idr, new_id);
-                return -EINVAL;
-        }
-        return new_id;
+        return ret == -ENOSPC ? -EINVAL : ret;
 }
 
 struct drm_master *drm_master_create(struct drm_minor *minor)
diff --git a/drivers/gpu/drm/exynos/exynos_drm_ipp.c b/drivers/gpu/drm/exynos/exynos_drm_ipp.c
index 1a556354e92f..1adce07ecb5b 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_ipp.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_ipp.c
@@ -137,21 +137,15 @@ static int ipp_create_id(struct idr *id_idr, struct mutex *lock, void *obj,
 
         DRM_DEBUG_KMS("%s\n", __func__);
 
-again:
-        /* ensure there is space available to allocate a handle */
-        if (idr_pre_get(id_idr, GFP_KERNEL) == 0) {
-                DRM_ERROR("failed to get idr.\n");
-                return -ENOMEM;
-        }
-
         /* do the allocation under our mutexlock */
         mutex_lock(lock);
-        ret = idr_get_new_above(id_idr, obj, 1, (int *)idp);
+        ret = idr_alloc(id_idr, obj, 1, 0, GFP_KERNEL);
         mutex_unlock(lock);
-        if (ret == -EAGAIN)
-                goto again;
+        if (ret < 0)
+                return ret;
 
-        return ret;
+        *idp = ret;
+        return 0;
 }
 
 static void *ipp_find_obj(struct idr *id_idr, struct mutex *lock, u32 id)
@@ -1786,8 +1780,6 @@ err_iommu:
                         drm_iommu_detach_device(drm_dev, ippdrv->dev);
 
 err_idr:
-        idr_remove_all(&ctx->ipp_idr);
-        idr_remove_all(&ctx->prop_idr);
         idr_destroy(&ctx->ipp_idr);
         idr_destroy(&ctx->prop_idr);
         return ret;
@@ -1965,8 +1957,6 @@ static int ipp_remove(struct platform_device *pdev)
         exynos_drm_subdrv_unregister(&ctx->subdrv);
 
         /* remove,destroy ipp idr */
-        idr_remove_all(&ctx->ipp_idr);
-        idr_remove_all(&ctx->prop_idr);
         idr_destroy(&ctx->ipp_idr);
         idr_destroy(&ctx->prop_idr);
 
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index 21177d9df423..94d873a6cffb 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -139,7 +139,7 @@ create_hw_context(struct drm_device *dev,
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct i915_hw_context *ctx;
-        int ret, id;
+        int ret;
 
         ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
         if (ctx == NULL)
@@ -164,22 +164,11 @@ create_hw_context(struct drm_device *dev,
 
         ctx->file_priv = file_priv;
 
-again:
-        if (idr_pre_get(&file_priv->context_idr, GFP_KERNEL) == 0) {
-                ret = -ENOMEM;
-                DRM_DEBUG_DRIVER("idr allocation failed\n");
-                goto err_out;
-        }
-
-        ret = idr_get_new_above(&file_priv->context_idr, ctx,
-                                DEFAULT_CONTEXT_ID + 1, &id);
-        if (ret == 0)
-                ctx->id = id;
-
-        if (ret == -EAGAIN)
-                goto again;
-        else if (ret)
+        ret = idr_alloc(&file_priv->context_idr, ctx, DEFAULT_CONTEXT_ID + 1, 0,
+                        GFP_KERNEL);
+        if (ret < 0)
                 goto err_out;
+        ctx->id = ret;
 
         return ctx;
 
diff --git a/drivers/gpu/drm/sis/sis_drv.c b/drivers/gpu/drm/sis/sis_drv.c
index 841065b998a1..5a5325e6b759 100644
--- a/drivers/gpu/drm/sis/sis_drv.c
+++ b/drivers/gpu/drm/sis/sis_drv.c
@@ -58,7 +58,6 @@ static int sis_driver_unload(struct drm_device *dev)
 {
         drm_sis_private_t *dev_priv = dev->dev_private;
 
-        idr_remove_all(&dev_priv->object_idr);
         idr_destroy(&dev_priv->object_idr);
 
         kfree(dev_priv);
diff --git a/drivers/gpu/drm/sis/sis_mm.c b/drivers/gpu/drm/sis/sis_mm.c
index 2b2f78c428af..9a43d98e5003 100644
--- a/drivers/gpu/drm/sis/sis_mm.c
+++ b/drivers/gpu/drm/sis/sis_mm.c
@@ -128,17 +128,10 @@ static int sis_drm_alloc(struct drm_device *dev, struct drm_file *file,
         if (retval)
                 goto fail_alloc;
 
-again:
-        if (idr_pre_get(&dev_priv->object_idr, GFP_KERNEL) == 0) {
-                retval = -ENOMEM;
-                goto fail_idr;
-        }
-
-        retval = idr_get_new_above(&dev_priv->object_idr, item, 1, &user_key);
-        if (retval == -EAGAIN)
-                goto again;
-        if (retval)
+        retval = idr_alloc(&dev_priv->object_idr, item, 1, 0, GFP_KERNEL);
+        if (retval < 0)
                 goto fail_idr;
+        user_key = retval;
 
         list_add(&item->owner_list, &file_priv->obj_list);
         mutex_unlock(&dev->struct_mutex);
diff --git a/drivers/gpu/drm/via/via_map.c b/drivers/gpu/drm/via/via_map.c
index c0f1cc7f5ca9..d0ab3fb32acd 100644
--- a/drivers/gpu/drm/via/via_map.c
+++ b/drivers/gpu/drm/via/via_map.c
@@ -120,7 +120,6 @@ int via_driver_unload(struct drm_device *dev)
 {
         drm_via_private_t *dev_priv = dev->dev_private;
 
-        idr_remove_all(&dev_priv->object_idr);
         idr_destroy(&dev_priv->object_idr);
 
         kfree(dev_priv);
diff --git a/drivers/gpu/drm/via/via_mm.c b/drivers/gpu/drm/via/via_mm.c
index 0d55432e02a2..0ab93ff09873 100644
--- a/drivers/gpu/drm/via/via_mm.c
+++ b/drivers/gpu/drm/via/via_mm.c
@@ -148,17 +148,10 @@ int via_mem_alloc(struct drm_device *dev, void *data,
         if (retval)
                 goto fail_alloc;
 
-again:
-        if (idr_pre_get(&dev_priv->object_idr, GFP_KERNEL) == 0) {
-                retval = -ENOMEM;
-                goto fail_idr;
-        }
-
-        retval = idr_get_new_above(&dev_priv->object_idr, item, 1, &user_key);
-        if (retval == -EAGAIN)
-                goto again;
-        if (retval)
+        retval = idr_alloc(&dev_priv->object_idr, item, 1, 0, GFP_KERNEL);
+        if (retval < 0)
                 goto fail_idr;
+        user_key = retval;
 
         list_add(&item->owner_list, &file_priv->obj_list);
         mutex_unlock(&dev->struct_mutex);
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
index 16556170fb32..bc784254e78e 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
@@ -177,17 +177,16 @@ int vmw_resource_alloc_id(struct vmw_resource *res)
 
         BUG_ON(res->id != -1);
 
-        do {
-                if (unlikely(idr_pre_get(idr, GFP_KERNEL) == 0))
-                        return -ENOMEM;
-
-                write_lock(&dev_priv->resource_lock);
-                ret = idr_get_new_above(idr, res, 1, &res->id);
-                write_unlock(&dev_priv->resource_lock);
+        idr_preload(GFP_KERNEL);
+        write_lock(&dev_priv->resource_lock);
 
-        } while (ret == -EAGAIN);
+        ret = idr_alloc(idr, res, 1, 0, GFP_NOWAIT);
+        if (ret >= 0)
+                res->id = ret;
 
-        return ret;
+        write_unlock(&dev_priv->resource_lock);
+        idr_preload_end();
+        return ret < 0 ? ret : 0;
 }
 
 /**