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

Commit dc344cc9 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "fs: fuse: lock the new non-CMA page before replace_page_cache_page()"

parents f82ea813 d4f8b279

fs/fuse/file.c

+2 −1
Original line number Diff line number Diff line
@@ -809,8 +809,10 @@ static int fuse_readpages_fill(void *_data, struct page *page) 
			return -ENOMEM;

		}



		lock_page(newpage);

		err = replace_page_cache_page(oldpage, newpage, GFP_KERNEL);

		if (err) {

			unlock_page(newpage);

			__free_page(newpage);

			page_cache_release(oldpage);

			return err;
@@ -820,7 +822,6 @@ static int fuse_readpages_fill(void *_data, struct page *page) 
		 * Decrement the count on new page to make page cache the only

		 * owner of it

		 */

		lock_page(newpage);

		put_page(newpage);



		lru_cache_add_file(newpage);