From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-we0-f174.google.com (mail-we0-f174.google.com [74.125.82.174]) by kanga.kvack.org (Postfix) with ESMTP id C88CC6B0035 for ; Mon, 28 Jul 2014 05:36:35 -0400 (EDT) Received: by mail-we0-f174.google.com with SMTP id x48so7045553wes.19 for ; Mon, 28 Jul 2014 02:36:35 -0700 (PDT) Received: from mx2.suse.de (cantor2.suse.de. [195.135.220.15]) by mx.google.com with ESMTPS id df8si33111636wjc.1.2014.07.28.02.36.34 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 28 Jul 2014 02:36:34 -0700 (PDT) Date: Mon, 28 Jul 2014 10:36:31 +0100 From: Mel Gorman Subject: Re: [PATCH] mm: fix filemap.c pagecache_get_page() kernel-doc warnings Message-ID: <20140728093630.GM10819@suse.de> References: <53D564ED.1030906@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline In-Reply-To: <53D564ED.1030906@infradead.org> Sender: owner-linux-mm@kvack.org List-ID: To: Randy Dunlap Cc: Linus Torvalds , Andrew Morton , Linux MM On Sun, Jul 27, 2014 at 01:45:33PM -0700, Randy Dunlap wrote: > From: Randy Dunlap > > Fix kernel-doc warnings in mm/filemap.c: pagecache_get_page(): > > Warning(..//mm/filemap.c:1054): No description found for parameter 'cache_gfp_mask' > Warning(..//mm/filemap.c:1054): No description found for parameter 'radix_gfp_mask' > Warning(..//mm/filemap.c:1054): Excess function parameter 'gfp_mask' description in 'pagecache_get_page' > > Fixes: 2457aec63745 "mm: non-atomically mark page accessed during > page cache allocation where possible" > > Signed-off-by: Randy Dunlap > Cc: Mel Gorman Use this diff instead? ---8<--- diff --git a/mm/filemap.c b/mm/filemap.c index dafb06f..a1021fa 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1031,18 +1031,21 @@ EXPORT_SYMBOL(find_lock_entry); * @mapping: the address_space to search * @offset: the page index * @fgp_flags: PCG flags - * @gfp_mask: gfp mask to use if a page is to be allocated + * @cache_gfp_mask: gfp mask to use for the page cache data page allocation + * @radix_gfp_mask: gfp mask to use for radix tree node allocation * * Looks up the page cache slot at @mapping & @offset. * - * PCG flags modify how the page is returned + * PCG flags modify how the page is returned. * * FGP_ACCESSED: the page will be marked accessed * FGP_LOCK: Page is return locked * FGP_CREAT: If page is not present then a new page is allocated using - * @gfp_mask and added to the page cache and the VM's LRU - * list. The page is returned locked and with an increased - * refcount. Otherwise, %NULL is returned. + * @cache_gfp_mask and added to the page cache and the VM's LRU + * list. If radix tree nodes are allocated during page cache + * insertion then @radix_gfp_mask is used. The page is returned + * locked and with an increased refcount. Otherwise, %NULL is + * returned. * * If FGP_LOCK or FGP_CREAT are specified then the function may sleep even * if the GFP flags specified for FGP_CREAT are atomic. -- Mel Gorman SUSE Labs -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org