mm/filemap: fold ra_submit into do_sync_mmap_readahead (db660d46) · Commits · 戴 / test

mm/filemap.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -2588,8 +2588,8 @@ static struct file do_sync_mmap_readahead(struct vm_fault vmf)
		struct file *file = vmf->vma->vm_file;
		struct file_ra_state *ra = &file->f_ra;
		struct address_space *mapping = file->f_mapping;
		DEFINE_READAHEAD(ractl, file, mapping, vmf->pgoff);
		struct file *fpin = NULL;
		pgoff_t offset = vmf->pgoff;
		unsigned int mmap_miss;

		/* If we don't want any read-ahead, don't bother */
		@@ -2600,8 +2600,7 @@ static struct file do_sync_mmap_readahead(struct vm_fault vmf)

		if (vmf->vma->vm_flags & VM_SEQ_READ) {
		fpin = maybe_unlock_mmap_for_io(vmf, fpin);
		page_cache_sync_readahead(mapping, ra, file, offset,
		ra->ra_pages);
		page_cache_sync_ra(&ractl, ra, ra->ra_pages);
		return fpin;
		}

		@@ -2621,10 +2620,11 @@ static struct file do_sync_mmap_readahead(struct vm_fault vmf)
		* mmap read-around
		*/
		fpin = maybe_unlock_mmap_for_io(vmf, fpin);
		ra->start = max_t(long, 0, offset - ra->ra_pages / 2);
		ra->start = max_t(long, 0, vmf->pgoff - ra->ra_pages / 2);
		ra->size = ra->ra_pages;
		ra->async_size = ra->ra_pages / 4;
		ra_submit(ra, mapping, file);
		ractl._index = ra->start;
		do_page_cache_ra(&ractl, ra->size, ra->async_size);
		return fpin;
		}

+0 −10

Original line number	Diff line number	Diff line
		@@ -59,16 +59,6 @@ static inline void force_page_cache_readahead(struct address_space *mapping,
		force_page_cache_ra(&ractl, nr_to_read);
		}

		/*
		* Submit IO for the read-ahead request in file_ra_state.
		*/
		static inline void ra_submit(struct file_ra_state *ra,
		struct address_space mapping, struct file file)
		{
		DEFINE_READAHEAD(ractl, file, mapping, ra->start);
		do_page_cache_ra(&ractl, ra->size, ra->async_size);
		}

		struct page find_get_entry(struct address_space mapping, pgoff_t index);
		struct page find_lock_entry(struct address_space mapping, pgoff_t index);