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
  ...

1 files changed, 10 insertions, 19 deletions

diff --git a/block/bsg.c b/block/bsg.c
index ff64ae3bacee..420a5a9f1b23 100644
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -800,11 +800,10 @@ static struct bsg_device *bsg_add_device(struct inode *inode,
 static struct bsg_device *__bsg_get_device(int minor, struct request_queue *q)
 {
         struct bsg_device *bd;
-        struct hlist_node *entry;
 
         mutex_lock(&bsg_mutex);
 
-        hlist_for_each_entry(bd, entry, bsg_dev_idx_hash(minor), dev_list) {
+        hlist_for_each_entry(bd, bsg_dev_idx_hash(minor), dev_list) {
                 if (bd->queue == q) {
                         atomic_inc(&bd->ref_count);
                         goto found;
@@ -997,7 +996,7 @@ int bsg_register_queue(struct request_queue *q, struct device *parent,
 {
         struct bsg_class_device *bcd;
         dev_t dev;
-        int ret, minor;
+        int ret;
         struct device *class_dev = NULL;
         const char *devname;
 
@@ -1017,23 +1016,16 @@ int bsg_register_queue(struct request_queue *q, struct device *parent,
 
         mutex_lock(&bsg_mutex);
 
-        ret = idr_pre_get(&bsg_minor_idr, GFP_KERNEL);
-        if (!ret) {
-                ret = -ENOMEM;
-                goto unlock;
-        }
-
-        ret = idr_get_new(&bsg_minor_idr, bcd, &minor);
-        if (ret < 0)
+        ret = idr_alloc(&bsg_minor_idr, bcd, 0, BSG_MAX_DEVS, GFP_KERNEL);
+        if (ret < 0) {
+                if (ret == -ENOSPC) {
+                        printk(KERN_ERR "bsg: too many bsg devices\n");
+                        ret = -EINVAL;
+                }
                 goto unlock;
-
-        if (minor >= BSG_MAX_DEVS) {
-                printk(KERN_ERR "bsg: too many bsg devices\n");
-                ret = -EINVAL;
-                goto remove_idr;
         }
 
-        bcd->minor = minor;
+        bcd->minor = ret;
         bcd->queue = q;
         bcd->parent = get_device(parent);
         bcd->release = release;
@@ -1059,8 +1051,7 @@ unregister_class_dev:
         device_unregister(class_dev);
 put_dev:
         put_device(parent);
-remove_idr:
-        idr_remove(&bsg_minor_idr, minor);
+        idr_remove(&bsg_minor_idr, bcd->minor);
 unlock:
         mutex_unlock(&bsg_mutex);
         return ret;