6 files changed, 10 insertions, 15 deletions

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