adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

mm: remove destroy_dirty_buffers from invalidate_bdev()

Browse source 
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>
This commit is contained in:
Peter Zijlstra 2007-05-06 14:49:54 -07:00 committed by Linus Torvalds
parent 0a27a14a62
commit f98393a64c
13 changed files with 20 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
block/ioctl.c
View file

@ -80,7 +80,7 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user
} }
/* all seems OK */ /* all seems OK */
fsync_bdev(bdevp); fsync_bdev(bdevp);
invalidate_bdev(bdevp, 0); invalidate_bdev(bdevp);
mutex_lock_nested(&bdev->bd_mutex, 1); mutex_lock_nested(&bdev->bd_mutex, 1);
delete_partition(disk, part); delete_partition(disk, part);
@ -236,7 +236,7 @@ int blkdev_ioctl(struct inode *inode, struct file *file, unsigned cmd,
lock_kernel(); lock_kernel();
fsync_bdev(bdev); fsync_bdev(bdev);
invalidate_bdev(bdev, 0); invalidate_bdev(bdev);
unlock_kernel(); unlock_kernel();
return 0; return 0;

2
drivers/block/amiflop.c
View file

@ -1480,7 +1480,7 @@ static int fd_ioctl(struct inode *inode, struct file *filp,
break; break;
case FDFMTEND: case FDFMTEND:
floppy_off(drive); floppy_off(drive);
invalidate_bdev(inode->i_bdev, 0); invalidate_bdev(inode->i_bdev);
break; break;
case FDGETPRM: case FDGETPRM:
memset((void *)&getprm, 0, sizeof (getprm)); memset((void *)&getprm, 0, sizeof (getprm));

4
drivers/block/loop.c
View file

@ -833,7 +833,7 @@ out_clr:
lo->lo_backing_file = NULL; lo->lo_backing_file = NULL;
lo->lo_flags = 0; lo->lo_flags = 0;
set_capacity(disks[lo->lo_number], 0); set_capacity(disks[lo->lo_number], 0);
invalidate_bdev(bdev, 0); invalidate_bdev(bdev);
bd_set_size(bdev, 0); bd_set_size(bdev, 0);
mapping_set_gfp_mask(mapping, lo->old_gfp_mask); mapping_set_gfp_mask(mapping, lo->old_gfp_mask);
lo->lo_state = Lo_unbound; 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_encrypt_key, 0, LO_KEY_SIZE);
memset(lo->lo_crypt_name, 0, LO_NAME_SIZE); memset(lo->lo_crypt_name, 0, LO_NAME_SIZE);
memset(lo->lo_file_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); set_capacity(disks[lo->lo_number], 0);
bd_set_size(bdev, 0); bd_set_size(bdev, 0);
mapping_set_gfp_mask(filp->f_mapping, gfp); mapping_set_gfp_mask(filp->f_mapping, gfp);

2
drivers/block/rd.c
View file

@ -403,7 +403,7 @@ static void __exit rd_cleanup(void)
struct block_device *bdev = rd_bdev[i]; struct block_device *bdev = rd_bdev[i];
rd_bdev[i] = NULL; rd_bdev[i] = NULL;
if (bdev) { if (bdev) {
invalidate_bdev(bdev, 1); invalidate_bdev(bdev);
blkdev_put(bdev); blkdev_put(bdev);
} }
del_gendisk(rd_disks[i]); del_gendisk(rd_disks[i]);

2
drivers/cdrom/cdrom.c
View file

@ -2384,7 +2384,7 @@ static int cdrom_ioctl_reset(struct cdrom_device_info *cdi,
return -EACCES; return -EACCES;
if (!CDROM_CAN(CDC_RESET)) if (!CDROM_CAN(CDC_RESET))
return -ENOSYS; return -ENOSYS;
invalidate_bdev(bdev, 0); invalidate_bdev(bdev);
return cdi->ops->reset(cdi); return cdi->ops->reset(cdi);
} }

2
drivers/md/md.c
View file

@ -3080,7 +3080,7 @@ static int do_md_run(mddev_t * mddev)
if (test_bit(Faulty, &rdev->flags)) if (test_bit(Faulty, &rdev->flags))
continue; continue;
sync_blockdev(rdev->bdev); sync_blockdev(rdev->bdev);
invalidate_bdev(rdev->bdev, 0); invalidate_bdev(rdev->bdev);
} }
md_probe(mddev->unit, NULL, NULL); md_probe(mddev->unit, NULL, NULL);

4
fs/block_dev.c
View file

@ -58,7 +58,7 @@ static sector_t max_block(struct block_device *bdev)
/* Kill _all_ buffers, dirty or not.. */ /* Kill _all_ buffers, dirty or not.. */
static void kill_bdev(struct block_device *bdev) static void kill_bdev(struct block_device *bdev)
{ {
invalidate_bdev(bdev, 1); invalidate_bdev(bdev);
truncate_inode_pages(bdev->bd_inode->i_mapping, 0); truncate_inode_pages(bdev->bd_inode->i_mapping, 0);
} }
@ -1478,7 +1478,7 @@ int __invalidate_device(struct block_device *bdev)
res = invalidate_inodes(sb); res = invalidate_inodes(sb);
drop_super(sb); drop_super(sb);
} }
invalidate_bdev(bdev, 0); invalidate_bdev(bdev);
return res; return res;
} }
EXPORT_SYMBOL(__invalidate_device); EXPORT_SYMBOL(__invalidate_device);

7
fs/buffer.c
View file

@ -333,7 +333,7 @@ out:
we think the disk contains more recent information than the buffercache. 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 The update == 1 pass marks the buffers we need to update, the update == 2
pass does the actual I/O. */ 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; 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; return;
invalidate_bh_lrus(); 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); invalidate_mapping_pages(mapping, 0, -1);
} }

4
fs/dquot.c
View file

@ -1432,7 +1432,7 @@ int vfs_quota_off(struct super_block *sb, int type)
mutex_unlock(&dqopt->dqonoff_mutex); mutex_unlock(&dqopt->dqonoff_mutex);
} }
if (sb->s_bdev) if (sb->s_bdev)
invalidate_bdev(sb->s_bdev, 0); invalidate_bdev(sb->s_bdev);
return 0; 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... */ * we see all the changes from userspace... */
write_inode_now(inode, 1); write_inode_now(inode, 1);
/* And now flush the block cache so that kernel sees the changes */ /* 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(&inode->i_mutex);
mutex_lock(&dqopt->dqonoff_mutex); mutex_lock(&dqopt->dqonoff_mutex);
if (sb_has_quota_enabled(sb, type)) { if (sb_has_quota_enabled(sb, type)) {

4
fs/ext3/super.c
View file

@ -420,7 +420,7 @@ static void ext3_put_super (struct super_block * sb)
dump_orphan_list(sb, sbi); dump_orphan_list(sb, sbi);
J_ASSERT(list_empty(&sbi->s_orphan)); 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) { if (sbi->journal_bdev && sbi->journal_bdev != sb->s_bdev) {
/* /*
* Invalidate the journal device's buffers. We don't want them * 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. * hotswapped, and it breaks the `ro-after' testing code.
*/ */
sync_blockdev(sbi->journal_bdev); sync_blockdev(sbi->journal_bdev);
invalidate_bdev(sbi->journal_bdev, 0); invalidate_bdev(sbi->journal_bdev);
ext3_blkdev_remove(sbi); ext3_blkdev_remove(sbi);
} }
sb->s_fs_info = NULL; sb->s_fs_info = NULL;

4
fs/ext4/super.c
View file

@ -470,7 +470,7 @@ static void ext4_put_super (struct super_block * sb)
dump_orphan_list(sb, sbi); dump_orphan_list(sb, sbi);
J_ASSERT(list_empty(&sbi->s_orphan)); 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) { if (sbi->journal_bdev && sbi->journal_bdev != sb->s_bdev) {
/* /*
* Invalidate the journal device's buffers. We don't want them * 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. * hotswapped, and it breaks the `ro-after' testing code.
*/ */
sync_blockdev(sbi->journal_bdev); sync_blockdev(sbi->journal_bdev);
invalidate_bdev(sbi->journal_bdev, 0); invalidate_bdev(sbi->journal_bdev);
ext4_blkdev_remove(sbi); ext4_blkdev_remove(sbi);
} }
sb->s_fs_info = NULL; sb->s_fs_info = NULL;

2
fs/partitions/acorn.c
View file

@ -271,7 +271,7 @@ adfspart_check_ADFS(struct parsed_partitions *state, struct block_device *bdev)
extern void xd_set_geometry(struct block_device *, extern void xd_set_geometry(struct block_device *,
unsigned char, unsigned char, unsigned int); unsigned char, unsigned char, unsigned int);
xd_set_geometry(bdev, dr->secspertrack, heads, 1); xd_set_geometry(bdev, dr->secspertrack, heads, 1);
invalidate_bdev(bdev, 1); invalidate_bdev(bdev);
truncate_inode_pages(bdev->bd_inode->i_mapping, 0); truncate_inode_pages(bdev->bd_inode->i_mapping, 0);
} }
#endif #endif

4
include/linux/buffer_head.h
View file

@ -165,7 +165,7 @@ int sync_mapping_buffers(struct address_space *mapping);
void unmap_underlying_metadata(struct block_device *bdev, sector_t block); void unmap_underlying_metadata(struct block_device *bdev, sector_t block);
void mark_buffer_async_write(struct buffer_head *bh); 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); int sync_blockdev(struct block_device *bdev);
void __wait_on_buffer(struct buffer_head *); void __wait_on_buffer(struct buffer_head *);
wait_queue_head_t *bh_waitq_head(struct buffer_head *bh); 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 void invalidate_inode_buffers(struct inode *inode) {}
static inline int remove_inode_buffers(struct inode *inode) { return 1; } 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 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 */ #endif /* CONFIG_BLOCK */