diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/block/amiflop.c | 2 | ||||
-rw-r--r-- | drivers/block/loop.c | 4 | ||||
-rw-r--r-- | drivers/block/rd.c | 2 | ||||
-rw-r--r-- | drivers/cdrom/cdrom.c | 2 | ||||
-rw-r--r-- | drivers/md/md.c | 2 |
5 files changed, 6 insertions, 6 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, | |||
1480 | break; | 1480 | break; |
1481 | case FDFMTEND: | 1481 | case FDFMTEND: |
1482 | floppy_off(drive); | 1482 | floppy_off(drive); |
1483 | invalidate_bdev(inode->i_bdev, 0); | 1483 | invalidate_bdev(inode->i_bdev); |
1484 | break; | 1484 | break; |
1485 | case FDGETPRM: | 1485 | case FDGETPRM: |
1486 | memset((void *)&getprm, 0, sizeof (getprm)); | 1486 | 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: | |||
833 | lo->lo_backing_file = NULL; | 833 | lo->lo_backing_file = NULL; |
834 | lo->lo_flags = 0; | 834 | lo->lo_flags = 0; |
835 | set_capacity(disks[lo->lo_number], 0); | 835 | set_capacity(disks[lo->lo_number], 0); |
836 | invalidate_bdev(bdev, 0); | 836 | invalidate_bdev(bdev); |
837 | bd_set_size(bdev, 0); | 837 | bd_set_size(bdev, 0); |
838 | mapping_set_gfp_mask(mapping, lo->old_gfp_mask); | 838 | mapping_set_gfp_mask(mapping, lo->old_gfp_mask); |
839 | lo->lo_state = Lo_unbound; | 839 | lo->lo_state = Lo_unbound; |
@@ -917,7 +917,7 @@ static int loop_clr_fd(struct loop_device *lo, struct block_device *bdev) | |||
917 | memset(lo->lo_encrypt_key, 0, LO_KEY_SIZE); | 917 | memset(lo->lo_encrypt_key, 0, LO_KEY_SIZE); |
918 | memset(lo->lo_crypt_name, 0, LO_NAME_SIZE); | 918 | memset(lo->lo_crypt_name, 0, LO_NAME_SIZE); |
919 | memset(lo->lo_file_name, 0, LO_NAME_SIZE); | 919 | memset(lo->lo_file_name, 0, LO_NAME_SIZE); |
920 | invalidate_bdev(bdev, 0); | 920 | invalidate_bdev(bdev); |
921 | set_capacity(disks[lo->lo_number], 0); | 921 | set_capacity(disks[lo->lo_number], 0); |
922 | bd_set_size(bdev, 0); | 922 | bd_set_size(bdev, 0); |
923 | mapping_set_gfp_mask(filp->f_mapping, gfp); | 923 | 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) | |||
403 | struct block_device *bdev = rd_bdev[i]; | 403 | struct block_device *bdev = rd_bdev[i]; |
404 | rd_bdev[i] = NULL; | 404 | rd_bdev[i] = NULL; |
405 | if (bdev) { | 405 | if (bdev) { |
406 | invalidate_bdev(bdev, 1); | 406 | invalidate_bdev(bdev); |
407 | blkdev_put(bdev); | 407 | blkdev_put(bdev); |
408 | } | 408 | } |
409 | del_gendisk(rd_disks[i]); | 409 | 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, | |||
2384 | return -EACCES; | 2384 | return -EACCES; |
2385 | if (!CDROM_CAN(CDC_RESET)) | 2385 | if (!CDROM_CAN(CDC_RESET)) |
2386 | return -ENOSYS; | 2386 | return -ENOSYS; |
2387 | invalidate_bdev(bdev, 0); | 2387 | invalidate_bdev(bdev); |
2388 | return cdi->ops->reset(cdi); | 2388 | return cdi->ops->reset(cdi); |
2389 | } | 2389 | } |
2390 | 2390 | ||
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) | |||
3080 | if (test_bit(Faulty, &rdev->flags)) | 3080 | if (test_bit(Faulty, &rdev->flags)) |
3081 | continue; | 3081 | continue; |
3082 | sync_blockdev(rdev->bdev); | 3082 | sync_blockdev(rdev->bdev); |
3083 | invalidate_bdev(rdev->bdev, 0); | 3083 | invalidate_bdev(rdev->bdev); |
3084 | } | 3084 | } |
3085 | 3085 | ||
3086 | md_probe(mddev->unit, NULL, NULL); | 3086 | md_probe(mddev->unit, NULL, NULL); |