From: Jan Kara <jack@suse.cz> To: Andrew Morton <akpm@linux-foundation.org> Cc: <linux-mm@kvack.org>, <linux-fsdevel@vger.kernel.org>, Daniel Jordan <daniel.m.jordan@oracle.com>, Jan Kara <jack@suse.cz>, linux-cifs@vger.kernel.org, Steve French <sfrench@samba.org> Subject: [PATCH 16/16] cifs: Use find_get_pages_range_tag() Date: Mon, 9 Oct 2017 17:13:59 +0200 [thread overview] Message-ID: <20171009151359.31984-17-jack@suse.cz> (raw) In-Reply-To: <20171009151359.31984-1-jack@suse.cz> wdata_alloc_and_fillpages() needlessly iterates calls to find_get_pages_tag(). Also it wants only pages from given range. Make it use find_get_pages_range_tag(). Suggested-by: Daniel Jordan <daniel.m.jordan@oracle.com> CC: linux-cifs@vger.kernel.org CC: Steve French <sfrench@samba.org> Signed-off-by: Jan Kara <jack@suse.cz> --- fs/cifs/file.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 92fdf9c35de2..df9f682708c6 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -1963,8 +1963,6 @@ wdata_alloc_and_fillpages(pgoff_t tofind, struct address_space *mapping, pgoff_t end, pgoff_t *index, unsigned int *found_pages) { - unsigned int nr_pages; - struct page **pages; struct cifs_writedata *wdata; wdata = cifs_writedata_alloc((unsigned int)tofind, @@ -1972,23 +1970,8 @@ wdata_alloc_and_fillpages(pgoff_t tofind, struct address_space *mapping, if (!wdata) return NULL; - /* - * find_get_pages_tag seems to return a max of 256 on each - * iteration, so we must call it several times in order to - * fill the array or the wsize is effectively limited to - * 256 * PAGE_SIZE. - */ - *found_pages = 0; - pages = wdata->pages; - do { - nr_pages = find_get_pages_tag(mapping, index, - PAGECACHE_TAG_DIRTY, tofind, - pages); - *found_pages += nr_pages; - tofind -= nr_pages; - pages += nr_pages; - } while (nr_pages && tofind && *index <= end); - + *found_pages = find_get_pages_range_tag(mapping, index, end, + PAGECACHE_TAG_DIRTY, tofind, wdata->pages); return wdata; } -- 2.12.3
WARNING: multiple messages have this Message-ID (diff)
From: Jan Kara <jack@suse.cz> To: Andrew Morton <akpm@linux-foundation.org> Cc: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, Daniel Jordan <daniel.m.jordan@oracle.com>, Jan Kara <jack@suse.cz>, linux-cifs@vger.kernel.org, Steve French <sfrench@samba.org> Subject: [PATCH 16/16] cifs: Use find_get_pages_range_tag() Date: Mon, 9 Oct 2017 17:13:59 +0200 [thread overview] Message-ID: <20171009151359.31984-17-jack@suse.cz> (raw) In-Reply-To: <20171009151359.31984-1-jack@suse.cz> wdata_alloc_and_fillpages() needlessly iterates calls to find_get_pages_tag(). Also it wants only pages from given range. Make it use find_get_pages_range_tag(). Suggested-by: Daniel Jordan <daniel.m.jordan@oracle.com> CC: linux-cifs@vger.kernel.org CC: Steve French <sfrench@samba.org> Signed-off-by: Jan Kara <jack@suse.cz> --- fs/cifs/file.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 92fdf9c35de2..df9f682708c6 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -1963,8 +1963,6 @@ wdata_alloc_and_fillpages(pgoff_t tofind, struct address_space *mapping, pgoff_t end, pgoff_t *index, unsigned int *found_pages) { - unsigned int nr_pages; - struct page **pages; struct cifs_writedata *wdata; wdata = cifs_writedata_alloc((unsigned int)tofind, @@ -1972,23 +1970,8 @@ wdata_alloc_and_fillpages(pgoff_t tofind, struct address_space *mapping, if (!wdata) return NULL; - /* - * find_get_pages_tag seems to return a max of 256 on each - * iteration, so we must call it several times in order to - * fill the array or the wsize is effectively limited to - * 256 * PAGE_SIZE. - */ - *found_pages = 0; - pages = wdata->pages; - do { - nr_pages = find_get_pages_tag(mapping, index, - PAGECACHE_TAG_DIRTY, tofind, - pages); - *found_pages += nr_pages; - tofind -= nr_pages; - pages += nr_pages; - } while (nr_pages && tofind && *index <= end); - + *found_pages = find_get_pages_range_tag(mapping, index, end, + PAGECACHE_TAG_DIRTY, tofind, wdata->pages); return wdata; } -- 2.12.3 -- 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: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2017-10-09 15:13 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-10-09 15:13 [PATCH 0/16 v3] Ranged pagevec tagged lookup Jan Kara 2017-10-09 15:13 ` Jan Kara 2017-10-09 15:13 ` [PATCH 01/16] mm: Implement find_get_pages_range_tag() Jan Kara 2017-10-09 15:13 ` Jan Kara 2017-10-09 15:13 ` [PATCH 02/16] btrfs: Use pagevec_lookup_range_tag() Jan Kara 2017-10-09 15:13 ` Jan Kara 2017-10-09 15:13 ` Jan Kara 2017-10-09 15:13 ` [PATCH 03/16] ceph: " Jan Kara 2017-10-09 15:13 ` Jan Kara 2017-10-09 15:13 ` [PATCH 04/16] ext4: " Jan Kara 2017-10-09 15:13 ` Jan Kara 2017-10-09 15:13 ` Jan Kara 2017-10-09 15:13 ` [PATCH 05/16] f2fs: " Jan Kara 2017-10-09 15:13 ` Jan Kara 2017-10-09 15:13 ` Jan Kara 2017-10-09 15:13 ` [PATCH 06/16] f2fs: Simplify page iteration loops Jan Kara 2017-10-09 15:13 ` Jan Kara 2017-10-09 15:13 ` Jan Kara 2017-10-09 15:13 ` [PATCH 07/16] f2fs: Use find_get_pages_tag() for looking up single page Jan Kara 2017-10-09 15:13 ` Jan Kara 2017-10-09 15:13 ` Jan Kara 2017-10-09 15:13 ` [PATCH 08/16] gfs2: Use pagevec_lookup_range_tag() Jan Kara 2017-10-09 15:13 ` [Cluster-devel] " Jan Kara 2017-10-09 15:13 ` Jan Kara 2017-10-09 15:13 ` [PATCH 09/16] nilfs2: " Jan Kara 2017-10-09 15:13 ` Jan Kara 2017-10-09 15:13 ` Jan Kara 2017-10-09 15:13 ` [PATCH 10/16] mm: Use pagevec_lookup_range_tag() in __filemap_fdatawait_range() Jan Kara 2017-10-09 15:13 ` Jan Kara 2017-10-09 15:13 ` [PATCH 11/16] mm: Use pagevec_lookup_range_tag() in write_cache_pages() Jan Kara 2017-10-09 15:13 ` Jan Kara 2017-10-09 15:13 ` [PATCH 12/16] mm: Add variant of pagevec_lookup_range_tag() taking number of pages Jan Kara 2017-10-09 15:13 ` Jan Kara 2017-10-09 15:13 ` [PATCH 13/16] ceph: Use pagevec_lookup_range_nr_tag() Jan Kara 2017-10-09 15:13 ` Jan Kara 2017-10-09 15:13 ` [PATCH 14/16] mm: Remove nr_pages argument from pagevec_lookup_{,range}_tag() Jan Kara 2017-10-09 15:13 ` Jan Kara 2017-10-09 15:13 ` [PATCH 15/16] afs: Use find_get_pages_range_tag() Jan Kara 2017-10-09 15:13 ` Jan Kara 2017-10-09 15:13 ` Jan Kara [this message] 2017-10-09 15:13 ` [PATCH 16/16] cifs: " Jan Kara 2017-10-10 17:48 ` Daniel Jordan
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=20171009151359.31984-17-jack@suse.cz \ --to=jack@suse.cz \ --cc=akpm@linux-foundation.org \ --cc=daniel.m.jordan@oracle.com \ --cc=linux-cifs@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=sfrench@samba.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.