aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2007-05-06 17:49:54 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-07 15:12:55 -0400
commitf98393a64ca1392130724c3acb4e3f325801d2b6 (patch)
treeb02838bdf84156ac923bb37b6cf5f5ed6aaa3d48 /fs
parent0a27a14a62921b438bb6f33772690d345a089be6 (diff)
mm: remove destroy_dirty_buffers from invalidate_bdev()
Remove the destroy_dirty_buffers argument from invalidate_bdev(), it hasn't been used in 6 years (so akpm says). find * -name \*.[ch] | xargs grep -l invalidate_bdev | while read file; do quilt add $file; sed -ie 's/invalidate_bdev(\([^,]*\),[^)]*)/invalidate_bdev(\1)/g' $file; done Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/block_dev.c4
-rw-r--r--fs/buffer.c7
-rw-r--r--fs/dquot.c4
-rw-r--r--fs/ext3/super.c4
-rw-r--r--fs/ext4/super.c4
-rw-r--r--fs/partitions/acorn.c2
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)
58/* Kill _all_ buffers, dirty or not.. */ 58/* Kill _all_ buffers, dirty or not.. */
59static void kill_bdev(struct block_device *bdev) 59static void kill_bdev(struct block_device *bdev)
60{ 60{
61 invalidate_bdev(bdev, 1); 61 invalidate_bdev(bdev);
62 truncate_inode_pages(bdev->bd_inode->i_mapping, 0); 62 truncate_inode_pages(bdev->bd_inode->i_mapping, 0);
63} 63}
64 64
@@ -1478,7 +1478,7 @@ int __invalidate_device(struct block_device *bdev)
1478 res = invalidate_inodes(sb); 1478 res = invalidate_inodes(sb);
1479 drop_super(sb); 1479 drop_super(sb);
1480 } 1480 }
1481 invalidate_bdev(bdev, 0); 1481 invalidate_bdev(bdev);
1482 return res; 1482 return res;
1483} 1483}
1484EXPORT_SYMBOL(__invalidate_device); 1484EXPORT_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:
333 we think the disk contains more recent information than the buffercache. 333 we think the disk contains more recent information than the buffercache.
334 The update == 1 pass marks the buffers we need to update, the update == 2 334 The update == 1 pass marks the buffers we need to update, the update == 2
335 pass does the actual I/O. */ 335 pass does the actual I/O. */
336void invalidate_bdev(struct block_device *bdev, int destroy_dirty_buffers) 336void invalidate_bdev(struct block_device *bdev)
337{ 337{
338 struct address_space *mapping = bdev->bd_inode->i_mapping; 338 struct address_space *mapping = bdev->bd_inode->i_mapping;
339 339
@@ -341,11 +341,6 @@ void invalidate_bdev(struct block_device *bdev, int destroy_dirty_buffers)
341 return; 341 return;
342 342
343 invalidate_bh_lrus(); 343 invalidate_bh_lrus();
344 /*
345 * FIXME: what about destroy_dirty_buffers?
346 * We really want to use invalidate_inode_pages2() for
347 * that, but not until that's cleaned up.
348 */
349 invalidate_mapping_pages(mapping, 0, -1); 344 invalidate_mapping_pages(mapping, 0, -1);
350} 345}
351 346
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)
1432 mutex_unlock(&dqopt->dqonoff_mutex); 1432 mutex_unlock(&dqopt->dqonoff_mutex);
1433 } 1433 }
1434 if (sb->s_bdev) 1434 if (sb->s_bdev)
1435 invalidate_bdev(sb->s_bdev, 0); 1435 invalidate_bdev(sb->s_bdev);
1436 return 0; 1436 return 0;
1437} 1437}
1438 1438
@@ -1468,7 +1468,7 @@ static int vfs_quota_on_inode(struct inode *inode, int type, int format_id)
1468 * we see all the changes from userspace... */ 1468 * we see all the changes from userspace... */
1469 write_inode_now(inode, 1); 1469 write_inode_now(inode, 1);
1470 /* And now flush the block cache so that kernel sees the changes */ 1470 /* And now flush the block cache so that kernel sees the changes */
1471 invalidate_bdev(sb->s_bdev, 0); 1471 invalidate_bdev(sb->s_bdev);
1472 mutex_lock(&inode->i_mutex); 1472 mutex_lock(&inode->i_mutex);
1473 mutex_lock(&dqopt->dqonoff_mutex); 1473 mutex_lock(&dqopt->dqonoff_mutex);
1474 if (sb_has_quota_enabled(sb, type)) { 1474 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)
420 dump_orphan_list(sb, sbi); 420 dump_orphan_list(sb, sbi);
421 J_ASSERT(list_empty(&sbi->s_orphan)); 421 J_ASSERT(list_empty(&sbi->s_orphan));
422 422
423 invalidate_bdev(sb->s_bdev, 0); 423 invalidate_bdev(sb->s_bdev);
424 if (sbi->journal_bdev && sbi->journal_bdev != sb->s_bdev) { 424 if (sbi->journal_bdev && sbi->journal_bdev != sb->s_bdev) {
425 /* 425 /*
426 * Invalidate the journal device's buffers. We don't want them 426 * Invalidate the journal device's buffers. We don't want them
@@ -428,7 +428,7 @@ static void ext3_put_super (struct super_block * sb)
428 * hotswapped, and it breaks the `ro-after' testing code. 428 * hotswapped, and it breaks the `ro-after' testing code.
429 */ 429 */
430 sync_blockdev(sbi->journal_bdev); 430 sync_blockdev(sbi->journal_bdev);
431 invalidate_bdev(sbi->journal_bdev, 0); 431 invalidate_bdev(sbi->journal_bdev);
432 ext3_blkdev_remove(sbi); 432 ext3_blkdev_remove(sbi);
433 } 433 }
434 sb->s_fs_info = NULL; 434 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)
470 dump_orphan_list(sb, sbi); 470 dump_orphan_list(sb, sbi);
471 J_ASSERT(list_empty(&sbi->s_orphan)); 471 J_ASSERT(list_empty(&sbi->s_orphan));
472 472
473 invalidate_bdev(sb->s_bdev, 0); 473 invalidate_bdev(sb->s_bdev);
474 if (sbi->journal_bdev && sbi->journal_bdev != sb->s_bdev) { 474 if (sbi->journal_bdev && sbi->journal_bdev != sb->s_bdev) {
475 /* 475 /*
476 * Invalidate the journal device's buffers. We don't want them 476 * Invalidate the journal device's buffers. We don't want them
@@ -478,7 +478,7 @@ static void ext4_put_super (struct super_block * sb)
478 * hotswapped, and it breaks the `ro-after' testing code. 478 * hotswapped, and it breaks the `ro-after' testing code.
479 */ 479 */
480 sync_blockdev(sbi->journal_bdev); 480 sync_blockdev(sbi->journal_bdev);
481 invalidate_bdev(sbi->journal_bdev, 0); 481 invalidate_bdev(sbi->journal_bdev);
482 ext4_blkdev_remove(sbi); 482 ext4_blkdev_remove(sbi);
483 } 483 }
484 sb->s_fs_info = NULL; 484 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)
271 extern void xd_set_geometry(struct block_device *, 271 extern void xd_set_geometry(struct block_device *,
272 unsigned char, unsigned char, unsigned int); 272 unsigned char, unsigned char, unsigned int);
273 xd_set_geometry(bdev, dr->secspertrack, heads, 1); 273 xd_set_geometry(bdev, dr->secspertrack, heads, 1);
274 invalidate_bdev(bdev, 1); 274 invalidate_bdev(bdev);
275 truncate_inode_pages(bdev->bd_inode->i_mapping, 0); 275 truncate_inode_pages(bdev->bd_inode->i_mapping, 0);
276 } 276 }
277#endif 277#endif