Commit 58721bd4 authored by Deepak R Varma's avatar Deepak R Varma Committed by Andreas Gruenbacher
Browse files

gfs2: Replace deprecated kmap_atomic with kmap_local_page 



kmap_atomic() is deprecated in favor of kmap_local_{folio,page}().

Therefore, replace kmap_atomic() with kmap_local_page() in
gfs2_internal_read() and stuffed_readpage().

kmap_atomic() disables page-faults and preemption (the latter only for
!PREEMPT_RT kernels), However, the code within the mapping/un-mapping in
gfs2_internal_read() and stuffed_readpage() does not depend on the
above-mentioned side effects.

Therefore, a mere replacement of the old API with the new one is all that
is required (i.e., there is no need to explicitly add any calls to
pagefault_disable() and/or preempt_disable()).

Signed-off-by: default avatarDeepak R Varma <drv@mailo.com>
Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent f246dd4b

fs/gfs2/aops.c

+4 −4
Original line number Diff line number Diff line
@@ -431,10 +431,10 @@ static int stuffed_readpage(struct gfs2_inode *ip, struct page *page) 
	if (error)

		return error;



	kaddr = kmap_atomic(page);

	kaddr = kmap_local_page(page);

	memcpy(kaddr, dibh->b_data + sizeof(struct gfs2_dinode), dsize);

	memset(kaddr + dsize, 0, PAGE_SIZE - dsize);

	kunmap_atomic(kaddr);

	kunmap_local(kaddr);

	flush_dcache_page(page);

	brelse(dibh);

	SetPageUptodate(page);
@@ -497,12 +497,12 @@ int gfs2_internal_read(struct gfs2_inode *ip, char *buf, loff_t *pos, 
				continue;

			return PTR_ERR(page);

		}

		p = kmap_atomic(page);

		p = kmap_local_page(page);

		amt = size - copied;

		if (offset + size > PAGE_SIZE)

			amt = PAGE_SIZE - offset;

		memcpy(buf + copied, p + offset, amt);

		kunmap_atomic(p);

		kunmap_local(p);

		put_page(page);

		copied += amt;

		index++;