Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c19a9cb authored by Jan Kara's avatar Jan Kara Committed by Linus Torvalds
Browse files

cifs: use find_get_pages_range_tag() 

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().

Link: http://lkml.kernel.org/r/20171009151359.31984-17-jack@suse.cz


Signed-off-by: default avatarJan Kara <jack@suse.cz>
Suggested-by: default avatarDaniel Jordan <daniel.m.jordan@oracle.com>
Reviewed-by: default avatarDaniel Jordan <daniel.m.jordan@oracle.com>
Cc: Steve French <sfrench@samba.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent aef6e415

fs/cifs/file.c

+2 −19
Original line number Diff line number Diff line
@@ -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;

}