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

Commit 53b55e55 authored by Cong Wang's avatar Cong Wang Committed by Cong Wang
Browse files

squashfs: remove the second argument of k[un]map_atomic() 



Signed-off-by: default avatarCong Wang <amwang@redhat.com>
parent 883da600

fs/squashfs/file.c

+4 −4
Original line number Diff line number Diff line
@@ -464,10 +464,10 @@ static int squashfs_readpage(struct file *file, struct page *page) 
		if (PageUptodate(push_page))

			goto skip_page;



		pageaddr = kmap_atomic(push_page, KM_USER0);

		pageaddr = kmap_atomic(push_page);

		squashfs_copy_data(pageaddr, buffer, offset, avail);

		memset(pageaddr + avail, 0, PAGE_CACHE_SIZE - avail);

		kunmap_atomic(pageaddr, KM_USER0);

		kunmap_atomic(pageaddr);

		flush_dcache_page(push_page);

		SetPageUptodate(push_page);

skip_page:
@@ -484,9 +484,9 @@ static int squashfs_readpage(struct file *file, struct page *page) 
error_out:

	SetPageError(page);

out:

	pageaddr = kmap_atomic(page, KM_USER0);

	pageaddr = kmap_atomic(page);

	memset(pageaddr, 0, PAGE_CACHE_SIZE);

	kunmap_atomic(pageaddr, KM_USER0);

	kunmap_atomic(pageaddr);

	flush_dcache_page(page);

	if (!PageError(page))

		SetPageUptodate(page);

fs/squashfs/symlink.c

+2 −2
Original line number Diff line number Diff line
@@ -90,14 +90,14 @@ static int squashfs_symlink_readpage(struct file *file, struct page *page) 
			goto error_out;

		}



		pageaddr = kmap_atomic(page, KM_USER0);

		pageaddr = kmap_atomic(page);

		copied = squashfs_copy_data(pageaddr + bytes, entry, offset,

								length - bytes);

		if (copied == length - bytes)

			memset(pageaddr + length, 0, PAGE_CACHE_SIZE - length);

		else

			block = entry->next_index;

		kunmap_atomic(pageaddr, KM_USER0);

		kunmap_atomic(pageaddr);

		squashfs_cache_put(entry);

	}