From: Jens Axboe <axboe@kernel.dk>
To: Ilya Dryomov <idryomov@gmail.com>,
Alexander Viro <viro@zeniv.linux.org.uk>
Cc: linux-fsdevel@vger.kernel.org
Subject: Re: [PATCH] block: use bd{grab,put}() instead of open-coding
Date: Wed, 13 Jan 2016 10:25:00 -0700 [thread overview]
Message-ID: <5696886C.3010703@kernel.dk> (raw)
In-Reply-To: <CAOi1vP-aNm3zhBBjxyDHrNWdA_GSac7GEf0Z3kWwJSFu=ujNFw@mail.gmail.com>
On 01/12/2016 08:18 AM, Ilya Dryomov wrote:
> On Fri, Nov 20, 2015 at 10:18 PM, Ilya Dryomov <idryomov@gmail.com> wrote:
>> - 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>
>> ---
>> drivers/char/raw.c | 2 +-
>> 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 6f8dd407c533..42ebf7b675c0 100644
>> --- a/fs/block_dev.c
>> +++ b/fs/block_dev.c
>> @@ -682,7 +682,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;
>> }
>> @@ -698,7 +698,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);
>> @@ -721,7 +721,7 @@ void bd_forget(struct inode *inode)
>> spin_unlock(&bdev_lock);
>>
>> if (bdev)
>> - iput(bdev->bd_inode);
>> + bdput(bdev);
>> }
>>
>> /**
>> --
>> 2.4.3
>
> Hello,
>
> Jens, Al - could one of you pick this cleanup up for 4.5-rc1?
Added, thanks.
--
Jens Axboe
prev parent reply other threads:[~2016-01-13 17:25 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-20 21:18 [PATCH] block: use bd{grab,put}() instead of open-coding Ilya Dryomov
2016-01-12 15:18 ` Ilya Dryomov
2016-01-13 17:25 ` Jens Axboe [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5696886C.3010703@kernel.dk \
--to=axboe@kernel.dk \
--cc=idryomov@gmail.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).