aboutsummaryrefslogtreecommitdiffstats
path: root/fs/block_dev.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2010-10-23 11:11:40 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2010-10-25 21:26:11 -0400
commit7de9c6ee3ecffd99e1628e81a5ea5468f7581a1f (patch)
tree88787e77ba8a253d0a26aeda4bd5e58532d592e0 /fs/block_dev.c
parent646ec4615cd05972581c9c5342ed7a1e77df17bb (diff)
new helper: ihold()
Clones an existing reference to inode; caller must already hold one. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/block_dev.c')
-rw-r--r--fs/block_dev.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c
index b737451e2e9d..81972eb34b39 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -550,7 +550,7 @@ EXPORT_SYMBOL(bdget);
550 */ 550 */
551struct block_device *bdgrab(struct block_device *bdev) 551struct block_device *bdgrab(struct block_device *bdev)
552{ 552{
553 atomic_inc(&bdev->bd_inode->i_count); 553 ihold(bdev->bd_inode);
554 return bdev; 554 return bdev;
555} 555}
556 556
@@ -580,7 +580,7 @@ static struct block_device *bd_acquire(struct inode *inode)
580 spin_lock(&bdev_lock); 580 spin_lock(&bdev_lock);
581 bdev = inode->i_bdev; 581 bdev = inode->i_bdev;
582 if (bdev) { 582 if (bdev) {
583 atomic_inc(&bdev->bd_inode->i_count); 583 ihold(bdev->bd_inode);
584 spin_unlock(&bdev_lock); 584 spin_unlock(&bdev_lock);
585 return bdev; 585 return bdev;
586 } 586 }
@@ -591,12 +591,12 @@ static struct block_device *bd_acquire(struct inode *inode)
591 spin_lock(&bdev_lock); 591 spin_lock(&bdev_lock);
592 if (!inode->i_bdev) { 592 if (!inode->i_bdev) {
593 /* 593 /*
594 * We take an additional bd_inode->i_count for inode, 594 * We take an additional reference to bd_inode,
595 * and it's released in clear_inode() of inode. 595 * and it's released in clear_inode() of inode.
596 * So, we can access it via ->i_mapping always 596 * So, we can access it via ->i_mapping always
597 * without igrab(). 597 * without igrab().
598 */ 598 */
599 atomic_inc(&bdev->bd_inode->i_count); 599 ihold(bdev->bd_inode);
600 inode->i_bdev = bdev; 600 inode->i_bdev = bdev;
601 inode->i_mapping = bdev->bd_inode->i_mapping; 601 inode->i_mapping = bdev->bd_inode->i_mapping;
602 list_add(&inode->i_devices, &bdev->bd_inodes); 602 list_add(&inode->i_devices, &bdev->bd_inodes);