linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Anand Jain <anand.jain@oracle.com>
To: Josef Bacik <josef@toxicpanda.com>, linux-btrfs@vger.kernel.org
Subject: Re: [PATCH RESEND v2 1/2] btrfs: drop never met condition of disk_total_bytes == 0
Date: Thu, 22 Oct 2020 17:40:16 +0800	[thread overview]
Message-ID: <d15e5325-2d6f-89a7-9382-383595e26d6c@oracle.com> (raw)
In-Reply-To: <4c9e4f3a-493e-d8b1-ee26-ba78884a8743@toxicpanda.com>



On 21/10/20 10:35 pm, Josef Bacik wrote:
> On 10/21/20 12:16 AM, Anand Jain wrote:
>> btrfs_device::disk_total_bytes is set even for a seed device (the
>> comment is wrong).
>>
>> The function fill_device_from_item() does the job of reading it from the
>> item and updating btrfs_device::disk_total_bytes. So both the missing
>> device and the seed devices do have their disk_total_bytes updated.
>>
>> Furthermore, while removing the device if there is a power loss, we could
>> have a device with its total_bytes = 0, that's still valid.
>>
>> So this patch removes the check dev->disk_total_bytes == 0 in the
>> function verify_one_dev_extent(), which it does nothing in it.
>>
>> And take this opportunity to introduce a check if the device::total_bytes
>> is more than the max device size in read_one_dev().
>>
>> Signed-off-by: Anand Jain <anand.jain@oracle.com>
>> Reviewed-by: Nikolay Borisov <nborisov@suse.com>
>> ---
>> v2: add check if the total_bytes is more than the actual device size in
>>      read_one_dev().
>>      update change log.
>>
>>   fs/btrfs/volumes.c | 25 ++++++++++---------------
>>   1 file changed, 10 insertions(+), 15 deletions(-)
>>
>> diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
>> index 2a5397fb4175..0c6049f9ace3 100644
>> --- a/fs/btrfs/volumes.c
>> +++ b/fs/btrfs/volumes.c
>> @@ -6847,6 +6847,16 @@ static int read_one_dev(struct extent_buffer 
>> *leaf,
>>       }
>>       fill_device_from_item(leaf, dev_item, device);
>> +    if (device->bdev) {
>> +        u64 max_total_bytes = i_size_read(device->bdev->bd_inode);
>> +
>> +        if (device->total_bytes > max_total_bytes) {
>> +            btrfs_err(fs_info,
>> +            "device total_bytes should be below %llu but found %llu",
> 
> "should be less than or equal to"
> 

Hm. Do you mean to say..

-               if (device->total_bytes > max_total_bytes) {
+               if (max_total_bytes <= device->total_bytes) {

OR

-               if (device->total_bytes > max_total_bytes) {
+               if (device->total_bytes <= max_total_bytes) {

The former is correct.
As device->total_bytes is the total_bytes as read from the dev_item.
And the max_total_bytes is the actual device size.



Thanks, Anand



> Thanks,
> 
> Josef

  reply	other threads:[~2020-10-22  9:40 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-24 10:11 [PATCH 0/2] fix verify_one_dev_extent and btrfs_find_device Anand Jain
2020-09-24 10:11 ` [PATCH 1/2] btrfs: drop never met condition of disk_total_bytes == 0 Anand Jain
2020-09-24 11:48   ` Nikolay Borisov
2020-09-24 11:58     ` Qu Wenruo
2020-09-24 12:19       ` Qu Wenruo
2020-09-25  4:17     ` Anand Jain
2020-09-25  6:19       ` Nikolay Borisov
2020-09-25  7:33         ` Anand Jain
2020-09-25  7:56           ` Nikolay Borisov
2020-09-25  8:12             ` Anand Jain
2020-10-05 13:22   ` Josef Bacik
2020-10-06 12:53     ` Anand Jain
2020-10-06 12:54   ` [PATCH v2 " Anand Jain
2020-10-21  4:16     ` [PATCH RESEND " Anand Jain
2020-10-21 14:35     ` Josef Bacik
2020-10-22  9:40       ` Anand Jain [this message]
2020-10-29 21:30     ` Anand Jain
2020-09-24 10:11 ` [PATCH 2/2] btrfs: fix btrfs_find_device unused arg seed Anand Jain
2020-09-24 10:21   ` Nikolay Borisov
2020-09-25  8:22     ` Nikolay Borisov
2020-09-25  8:42       ` Anand Jain
2020-10-05 13:23   ` Josef Bacik
2020-10-21  4:16   ` [PATCH RESEND " Anand Jain
2020-10-29 21:30   ` [PATCH RESEND v2 " Anand Jain
2020-10-02  3:14 ` [PATCH 0/2] fix verify_one_dev_extent and btrfs_find_device Anand Jain
2020-10-21  4:16 ` [PATCH RESEND " Anand Jain
2020-10-29 21:02 ` David Sterba
2020-10-29 21:14   ` Anand Jain
2020-11-11 15:49     ` David Sterba
2020-10-29 21:30 ` Anand Jain

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=d15e5325-2d6f-89a7-9382-383595e26d6c@oracle.com \
    --to=anand.jain@oracle.com \
    --cc=josef@toxicpanda.com \
    --cc=linux-btrfs@vger.kernel.org \
    /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).