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

Commit 5c26eac4 authored by Fabian Frederick's avatar Fabian Frederick Committed by Jan Kara
Browse files

udf: use kmap_atomic for memcpy copying 



Use temporary mapping for memory copying operations.

To avoid any sleeping problem,

mark_inode_dirty(inode) was moved after kunmap() in
udf_adinicb_readpage()

down_write(&iinfo->i_data_sem) set before kmap_atomic()
in udf_expand_file_adinicb()

Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 6ff6b2b3

fs/udf/file.c

+5 −5
Original line number Diff line number Diff line
@@ -44,12 +44,12 @@ static void __udf_adinicb_readpage(struct page *page) 
	char *kaddr;

	struct udf_inode_info *iinfo = UDF_I(inode);



	kaddr = kmap(page);

	kaddr = kmap_atomic(page);

	memcpy(kaddr, iinfo->i_ext.i_data + iinfo->i_lenEAttr, inode->i_size);

	memset(kaddr + inode->i_size, 0, PAGE_SIZE - inode->i_size);

	flush_dcache_page(page);

	SetPageUptodate(page);

	kunmap(page);

	kunmap_atomic(kaddr);

}



static int udf_adinicb_readpage(struct file *file, struct page *page)
@@ -70,11 +70,11 @@ static int udf_adinicb_writepage(struct page *page, 


	BUG_ON(!PageLocked(page));



	kaddr = kmap(page);

	kaddr = kmap_atomic(page);

	memcpy(iinfo->i_ext.i_data + iinfo->i_lenEAttr, kaddr, inode->i_size);

	mark_inode_dirty(inode);

	SetPageUptodate(page);

	kunmap(page);

	kunmap_atomic(kaddr);

	mark_inode_dirty(inode);

	unlock_page(page);



	return 0;

fs/udf/inode.c

+4 −4
Original line number Diff line number Diff line
@@ -276,14 +276,14 @@ int udf_expand_file_adinicb(struct inode *inode) 
		return -ENOMEM;



	if (!PageUptodate(page)) {

		kaddr = kmap(page);

		kaddr = kmap_atomic(page);

		memset(kaddr + iinfo->i_lenAlloc, 0x00,

		       PAGE_SIZE - iinfo->i_lenAlloc);

		memcpy(kaddr, iinfo->i_ext.i_data + iinfo->i_lenEAttr,

			iinfo->i_lenAlloc);

		flush_dcache_page(page);

		SetPageUptodate(page);

		kunmap(page);

		kunmap_atomic(kaddr);

	}

	down_write(&iinfo->i_data_sem);

	memset(iinfo->i_ext.i_data + iinfo->i_lenEAttr, 0x00,
@@ -300,11 +300,11 @@ int udf_expand_file_adinicb(struct inode *inode) 
	if (err) {

		/* Restore everything back so that we don't lose data... */

		lock_page(page);

		kaddr = kmap(page);

		down_write(&iinfo->i_data_sem);

		kaddr = kmap_atomic(page);

		memcpy(iinfo->i_ext.i_data + iinfo->i_lenEAttr, kaddr,

		       inode->i_size);

		kunmap(page);

		kunmap_atomic(kaddr);

		unlock_page(page);

		iinfo->i_alloc_type = ICBTAG_FLAG_AD_IN_ICB;

		inode->i_data.a_ops = &udf_adinicb_aops;