diff options
| author | Ilya Dryomov <idryomov@gmail.com> | 2015-11-20 22:18:43 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-01-13 10:24:27 -0700 |
| commit | ed8a9d2c816e0b0a2c5a605505e0f09ae9010dd6 (patch) | |
| tree | db36fbeeb9480457e126a1e29e26acaf4011f8f4 | |
| parent | e36f6204288088fda50d1c84830340ccb70f85ff (diff) | |
| download | linux-stable-ed8a9d2c816e0b0a2c5a605505e0f09ae9010dd6.tar.gz linux-stable-ed8a9d2c816e0b0a2c5a605505e0f09ae9010dd6.tar.bz2 linux-stable-ed8a9d2c816e0b0a2c5a605505e0f09ae9010dd6.zip | |
block: use bd{grab,put}() instead of open-coding
- bd_acquire() and bd_forget() open-code bdgrab() and bdput()
- raw driver uses igrab() but never checks its return value and always
holds another ref from bind_set() while calling it, so it's
equivalent to bdgrab()
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
| -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) err = -ENODEV; if (!bdev) goto out; - igrab(bdev->bd_inode); + bdgrab(bdev); err = blkdev_get(bdev, filp->f_mode | FMODE_EXCL, raw_open); if (err) 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) spin_lock(&bdev_lock); bdev = inode->i_bdev; if (bdev) { - ihold(bdev->bd_inode); + bdgrab(bdev); spin_unlock(&bdev_lock); return bdev; } @@ -712,7 +712,7 @@ static struct block_device *bd_acquire(struct inode *inode) * So, we can access it via ->i_mapping always * without igrab(). */ - ihold(bdev->bd_inode); + bdgrab(bdev); inode->i_bdev = bdev; inode->i_mapping = bdev->bd_inode->i_mapping; list_add(&inode->i_devices, &bdev->bd_inodes); @@ -735,7 +735,7 @@ void bd_forget(struct inode *inode) spin_unlock(&bdev_lock); if (bdev) - iput(bdev->bd_inode); + bdput(bdev); } /** |