Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Subject: Re: linux-next: build warning after merge of the block tree
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20210813194116.3a0297d6@canb.auug.org.au>
 <b2492209-732c-9871-6085-6a17659f6429@kernel.dk>
 <20210903164939.02f6e8c5@canb.auug.org.au>
From:   Jens Axboe <axboe@kernel.dk>
Message-ID: <fdf2e372-a5fb-7476-6b17-c6cccf5b8d40@kernel.dk>
Date:   Fri, 3 Sep 2021 07:41:34 -0600
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.10.0
MIME-Version: 1.0
In-Reply-To: <20210903164939.02f6e8c5@canb.auug.org.au>
Content-Type: text/plain; charset=windows-1252
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 9/3/21 12:49 AM, Stephen Rothwell wrote:
> Hi Jens,
> 
> On Fri, 13 Aug 2021 07:54:51 -0600 Jens Axboe <axboe@kernel.dk> wrote:
>>
>> On 8/13/21 3:41 AM, Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> After merging the block tree, today's linux-next build (htmldocs)
>>> produced this warning:
>>>
>>> block/bio.c:1689: warning: Function parameter or member 'nr_vecs' not described in 'bio_alloc_kiocb'
>>>
>>> Introduced by commit
>>>
>>>   1cbbd31c4ada ("bio: add allocation cache abstraction")  
>>
>> Thanks, fixed up.
> 
> Not really :-(  I am now also getting this (the above has moved to line
> 1704 as well):
> 
> block/bio.c:1704: warning: Excess function parameter 'nr_iovecs' description in 'bio_alloc_kiocb'

This should fix that one up:

diff --git a/block/bio.c b/block/bio.c
index e16849f46b0e..5df3dd282e40 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -1688,7 +1688,7 @@ EXPORT_SYMBOL(bioset_init_from_src);
 /**
  * bio_alloc_kiocb - Allocate a bio from bio_set based on kiocb
  * @kiocb:	kiocb describing the IO
- * @nr_iovecs:	number of iovecs to pre-allocate
+ * @nr_vecs:	number of iovecs to pre-allocate
  * @bs:		bio_set to allocate from
  *
  * Description:

-- 
Jens Axboe