diff options
-rw-r--r-- | drivers/char/raw.c | 2 | ||||
-rw-r--r-- | fs/block_dev.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/raw.c b/drivers/char/raw.c index 60316fbaf295..9b9809b709a5 100644 --- a/drivers/char/raw.c +++ b/drivers/char/raw.c | |||
@@ -71,7 +71,7 @@ static int raw_open(struct inode *inode, struct file *filp) | |||
71 | err = -ENODEV; | 71 | err = -ENODEV; |
72 | if (!bdev) | 72 | if (!bdev) |
73 | goto out; | 73 | goto out; |
74 | igrab(bdev->bd_inode); | 74 | bdgrab(bdev); |
75 | err = blkdev_get(bdev, filp->f_mode | FMODE_EXCL, raw_open); | 75 | err = blkdev_get(bdev, filp->f_mode | FMODE_EXCL, raw_open); |
76 | if (err) | 76 | if (err) |
77 | goto out; | 77 | goto out; |
diff --git a/fs/block_dev.c b/fs/block_dev.c index aa1a45985889..8b02c90ced87 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c | |||
@@ -696,7 +696,7 @@ static struct block_device *bd_acquire(struct inode *inode) | |||
696 | spin_lock(&bdev_lock); | 696 | spin_lock(&bdev_lock); |
697 | bdev = inode->i_bdev; | 697 | bdev = inode->i_bdev; |
698 | if (bdev) { | 698 | if (bdev) { |
699 | ihold(bdev->bd_inode); | 699 | bdgrab(bdev); |
700 | spin_unlock(&bdev_lock); | 700 | spin_unlock(&bdev_lock); |
701 | return bdev; | 701 | return bdev; |
702 | } | 702 | } |
@@ -712,7 +712,7 @@ static struct block_device *bd_acquire(struct inode *inode) | |||
712 | * So, we can access it via ->i_mapping always | 712 | * So, we can access it via ->i_mapping always |
713 | * without igrab(). | 713 | * without igrab(). |
714 | */ | 714 | */ |
715 | ihold(bdev->bd_inode); | 715 | bdgrab(bdev); |
716 | inode->i_bdev = bdev; | 716 | inode->i_bdev = bdev; |
717 | inode->i_mapping = bdev->bd_inode->i_mapping; | 717 | inode->i_mapping = bdev->bd_inode->i_mapping; |
718 | list_add(&inode->i_devices, &bdev->bd_inodes); | 718 | list_add(&inode->i_devices, &bdev->bd_inodes); |
@@ -735,7 +735,7 @@ void bd_forget(struct inode *inode) | |||
735 | spin_unlock(&bdev_lock); | 735 | spin_unlock(&bdev_lock); |
736 | 736 | ||
737 | if (bdev) | 737 | if (bdev) |
738 | iput(bdev->bd_inode); | 738 | bdput(bdev); |
739 | } | 739 | } |
740 | 740 | ||
741 | /** | 741 | /** |