4 files changed, 9 insertions, 7 deletions

diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c
index 5d6562171533..27a139025ced 100644
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
@@ -1480,7 +1480,7 @@ static int fd_ioctl(struct inode *inode, struct file *filp,
                 break;
         case FDFMTEND:
                 floppy_off(drive);
-                invalidate_bdev(inode->i_bdev, 0);
+                invalidate_bdev(inode->i_bdev);
                 break;
         case FDGETPRM:
                 memset((void *)&getprm, 0, sizeof (getprm));
diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
index 1a6aeac5a1c3..01fbdd38e3be 100644
--- a/drivers/block/aoe/aoecmd.c
+++ b/drivers/block/aoe/aoecmd.c
@@ -194,15 +194,15 @@ aoecmd_cfg_pkts(ushort aoemajor, unsigned char aoeminor, struct sk_buff **tail)
         sl = sl_tail = NULL;
 
         read_lock(&dev_base_lock);
-        for (ifp = dev_base; ifp; dev_put(ifp), ifp = ifp->next) {
+        for_each_netdev(ifp) {
                 dev_hold(ifp);
                 if (!is_aoe_netif(ifp))
-                        continue;
+                        goto cont;
 
                 skb = new_skb(sizeof *h + sizeof *ch);
                 if (skb == NULL) {
                         printk(KERN_INFO "aoe: skb alloc failure\n");
-                        continue;
+                        goto cont;
                 }
                 skb_put(skb, sizeof *h + sizeof *ch);
                 skb->dev = ifp;
@@ -221,6 +221,8 @@ aoecmd_cfg_pkts(ushort aoemajor, unsigned char aoeminor, struct sk_buff **tail)
 
                 skb->next = sl;
                 sl = skb;
+cont:
+                dev_put(ifp);
         }
         read_unlock(&dev_base_lock);
 
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 6b5b64207407..0d4ccd4a0957 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -833,7 +833,7 @@ out_clr:
         lo->lo_backing_file = NULL;
         lo->lo_flags = 0;
         set_capacity(disks[lo->lo_number], 0);
-        invalidate_bdev(bdev, 0);
+        invalidate_bdev(bdev);
         bd_set_size(bdev, 0);
         mapping_set_gfp_mask(mapping, lo->old_gfp_mask);
         lo->lo_state = Lo_unbound;
@@ -917,7 +917,7 @@ static int loop_clr_fd(struct loop_device *lo, struct block_device *bdev)
         memset(lo->lo_encrypt_key, 0, LO_KEY_SIZE);
         memset(lo->lo_crypt_name, 0, LO_NAME_SIZE);
         memset(lo->lo_file_name, 0, LO_NAME_SIZE);
-        invalidate_bdev(bdev, 0);
+        invalidate_bdev(bdev);
         set_capacity(disks[lo->lo_number], 0);
         bd_set_size(bdev, 0);
         mapping_set_gfp_mask(filp->f_mapping, gfp);
diff --git a/drivers/block/rd.c b/drivers/block/rd.c
index 485aa87e9bcd..43d4ebcb3b44 100644
--- a/drivers/block/rd.c
+++ b/drivers/block/rd.c
@@ -403,7 +403,7 @@ static void __exit rd_cleanup(void)
                 struct block_device *bdev = rd_bdev[i];
                 rd_bdev[i] = NULL;
                 if (bdev) {
-                        invalidate_bdev(bdev, 1);
+                        invalidate_bdev(bdev);
                         blkdev_put(bdev);
                 }
                 del_gendisk(rd_disks[i]);