13 files changed, 20 insertions, 25 deletions

diff --git a/block/ioctl.c b/block/ioctl.c
index e06dbe9bc858..f7e3e8abf887 100644
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -80,7 +80,7 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user
                         }
                         /* all seems OK */
                         fsync_bdev(bdevp);
-                        invalidate_bdev(bdevp, 0);
+                        invalidate_bdev(bdevp);
 
                         mutex_lock_nested(&bdev->bd_mutex, 1);
                         delete_partition(disk, part);
@@ -236,7 +236,7 @@ int blkdev_ioctl(struct inode *inode, struct file *file, unsigned cmd,
 
                 lock_kernel();
                 fsync_bdev(bdev);
-                invalidate_bdev(bdev, 0);
+                invalidate_bdev(bdev);
                 unlock_kernel();
                 return 0;
 
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/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]);
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index b36f44d4d1bf..3625a05bc3d3 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -2384,7 +2384,7 @@ static int cdrom_ioctl_reset(struct cdrom_device_info *cdi,
                 return -EACCES;
         if (!CDROM_CAN(CDC_RESET))
                 return -ENOSYS;
-        invalidate_bdev(bdev, 0);
+        invalidate_bdev(bdev);
         return cdi->ops->reset(cdi);
 }
 
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 509171ca7fa8..2b4315d7e5d6 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -3080,7 +3080,7 @@ static int do_md_run(mddev_t * mddev)
                 if (test_bit(Faulty, &rdev->flags))
                         continue;
                 sync_blockdev(rdev->bdev);
-                invalidate_bdev(rdev->bdev, 0);
+                invalidate_bdev(rdev->bdev);
         }
 
         md_probe(mddev->unit, NULL, NULL);
diff --git a/fs/block_dev.c b/fs/block_dev.c
index 575076c018f4..21e59acbcfdf 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -58,7 +58,7 @@ static sector_t max_block(struct block_device *bdev)
 /* Kill _all_ buffers, dirty or not.. */
 static void kill_bdev(struct block_device *bdev)
 {
-        invalidate_bdev(bdev, 1);
+        invalidate_bdev(bdev);
         truncate_inode_pages(bdev->bd_inode->i_mapping, 0);
 }       
 
@@ -1478,7 +1478,7 @@ int __invalidate_device(struct block_device *bdev)
                 res = invalidate_inodes(sb);
                 drop_super(sb);
         }
-        invalidate_bdev(bdev, 0);
+        invalidate_bdev(bdev);
         return res;
 }
 EXPORT_SYMBOL(__invalidate_device);
diff --git a/fs/buffer.c b/fs/buffer.c
index dcc5faa573ba..630df3e6fe0c 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -333,7 +333,7 @@ out:
    we think the disk contains more recent information than the buffercache.
    The update == 1 pass marks the buffers we need to update, the update == 2
    pass does the actual I/O. */
-void invalidate_bdev(struct block_device *bdev, int destroy_dirty_buffers)
+void invalidate_bdev(struct block_device *bdev)
 {
         struct address_space *mapping = bdev->bd_inode->i_mapping;
 
@@ -341,11 +341,6 @@ void invalidate_bdev(struct block_device *bdev, int destroy_dirty_buffers)
                 return;
 
         invalidate_bh_lrus();
-        /*
-         * FIXME: what about destroy_dirty_buffers?
-         * We really want to use invalidate_inode_pages2() for
-         * that, but not until that's cleaned up.
-         */
         invalidate_mapping_pages(mapping, 0, -1);
 }
 
diff --git a/fs/dquot.c b/fs/dquot.c
index b16f991662c1..0a5febc159f2 100644
--- a/fs/dquot.c
+++ b/fs/dquot.c
@@ -1432,7 +1432,7 @@ int vfs_quota_off(struct super_block *sb, int type)
                         mutex_unlock(&dqopt->dqonoff_mutex);
                 }
         if (sb->s_bdev)
-                invalidate_bdev(sb->s_bdev, 0);
+                invalidate_bdev(sb->s_bdev);
         return 0;
 }
 
@@ -1468,7 +1468,7 @@ static int vfs_quota_on_inode(struct inode *inode, int type, int format_id)
          * we see all the changes from userspace... */
         write_inode_now(inode, 1);
         /* And now flush the block cache so that kernel sees the changes */
-        invalidate_bdev(sb->s_bdev, 0);
+        invalidate_bdev(sb->s_bdev);
         mutex_lock(&inode->i_mutex);
         mutex_lock(&dqopt->dqonoff_mutex);
         if (sb_has_quota_enabled(sb, type)) {
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 4a4fcd6868c7..4266b708ca01 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -420,7 +420,7 @@ static void ext3_put_super (struct super_block * sb)
                 dump_orphan_list(sb, sbi);
         J_ASSERT(list_empty(&sbi->s_orphan));
 
-        invalidate_bdev(sb->s_bdev, 0);
+        invalidate_bdev(sb->s_bdev);
         if (sbi->journal_bdev && sbi->journal_bdev != sb->s_bdev) {
                 /*
                  * Invalidate the journal device's buffers.  We don't want them
@@ -428,7 +428,7 @@ static void ext3_put_super (struct super_block * sb)
                  * hotswapped, and it breaks the `ro-after' testing code.
                  */
                 sync_blockdev(sbi->journal_bdev);
-                invalidate_bdev(sbi->journal_bdev, 0);
+                invalidate_bdev(sbi->journal_bdev);
                 ext3_blkdev_remove(sbi);
         }
         sb->s_fs_info = NULL;
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 61c4718e4a53..25e8d0096176 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -470,7 +470,7 @@ static void ext4_put_super (struct super_block * sb)
                 dump_orphan_list(sb, sbi);
         J_ASSERT(list_empty(&sbi->s_orphan));
 
-        invalidate_bdev(sb->s_bdev, 0);
+        invalidate_bdev(sb->s_bdev);
         if (sbi->journal_bdev && sbi->journal_bdev != sb->s_bdev) {
                 /*
                  * Invalidate the journal device's buffers.  We don't want them
@@ -478,7 +478,7 @@ static void ext4_put_super (struct super_block * sb)
                  * hotswapped, and it breaks the `ro-after' testing code.
                  */
                 sync_blockdev(sbi->journal_bdev);
-                invalidate_bdev(sbi->journal_bdev, 0);
+                invalidate_bdev(sbi->journal_bdev);
                 ext4_blkdev_remove(sbi);
         }
         sb->s_fs_info = NULL;
diff --git a/fs/partitions/acorn.c b/fs/partitions/acorn.c
index 1bc9f372c7d4..9a6826c63818 100644
--- a/fs/partitions/acorn.c
+++ b/fs/partitions/acorn.c
@@ -271,7 +271,7 @@ adfspart_check_ADFS(struct parsed_partitions *state, struct block_device *bdev)
                 extern void xd_set_geometry(struct block_device *,
                         unsigned char, unsigned char, unsigned int);
                 xd_set_geometry(bdev, dr->secspertrack, heads, 1);
-                invalidate_bdev(bdev, 1);
+                invalidate_bdev(bdev);
                 truncate_inode_pages(bdev->bd_inode->i_mapping, 0);
         }
 #endif
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index dd27b1c7227f..632c50b21386 100644
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
@@ -165,7 +165,7 @@ int sync_mapping_buffers(struct address_space *mapping);
 void unmap_underlying_metadata(struct block_device *bdev, sector_t block);
 
 void mark_buffer_async_write(struct buffer_head *bh);
-void invalidate_bdev(struct block_device *, int);
+void invalidate_bdev(struct block_device *);
 int sync_blockdev(struct block_device *bdev);
 void __wait_on_buffer(struct buffer_head *);
 wait_queue_head_t *bh_waitq_head(struct buffer_head *bh);
@@ -319,7 +319,7 @@ static inline int inode_has_buffers(struct inode *inode) { return 0; }
 static inline void invalidate_inode_buffers(struct inode *inode) {}
 static inline int remove_inode_buffers(struct inode *inode) { return 1; }
 static inline int sync_mapping_buffers(struct address_space *mapping) { return 0; }
-static inline void invalidate_bdev(struct block_device *bdev, int destroy_dirty_buffers) {}
+static inline void invalidate_bdev(struct block_device *bdev) {}
 
 
 #endif /* CONFIG_BLOCK */