aboutsummaryrefslogtreecommitdiffstats
path: root/fs/udf/file.c
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2017-04-23 14:58:34 -0400
committerJan Kara <jack@suse.cz>2017-04-24 10:28:02 -0400
commit5c26eac43a0b708083ebd99e0ba57c9b268cef84 (patch)
treee9a0ed9341c465afd48bec233c3cad499a37b847 /fs/udf/file.c
parent6ff6b2b32924d53519948e270cb9f5549408c039 (diff)
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: Fabian Frederick <fabf@skynet.be> Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/udf/file.c')
-rw-r--r--fs/udf/file.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/udf/file.c b/fs/udf/file.c
index e04cc0cdca9d..f5eb2d5b3bac 100644
--- a/fs/udf/file.c
+++ b/fs/udf/file.c
@@ -44,12 +44,12 @@ static void __udf_adinicb_readpage(struct page *page)
44 char *kaddr; 44 char *kaddr;
45 struct udf_inode_info *iinfo = UDF_I(inode); 45 struct udf_inode_info *iinfo = UDF_I(inode);
46 46
47 kaddr = kmap(page); 47 kaddr = kmap_atomic(page);
48 memcpy(kaddr, iinfo->i_ext.i_data + iinfo->i_lenEAttr, inode->i_size); 48 memcpy(kaddr, iinfo->i_ext.i_data + iinfo->i_lenEAttr, inode->i_size);
49 memset(kaddr + inode->i_size, 0, PAGE_SIZE - inode->i_size); 49 memset(kaddr + inode->i_size, 0, PAGE_SIZE - inode->i_size);
50 flush_dcache_page(page); 50 flush_dcache_page(page);
51 SetPageUptodate(page); 51 SetPageUptodate(page);
52 kunmap(page); 52 kunmap_atomic(kaddr);
53} 53}
54 54
55static int udf_adinicb_readpage(struct file *file, struct page *page) 55static int udf_adinicb_readpage(struct file *file, struct page *page)
@@ -70,11 +70,11 @@ static int udf_adinicb_writepage(struct page *page,
70 70
71 BUG_ON(!PageLocked(page)); 71 BUG_ON(!PageLocked(page));
72 72
73 kaddr = kmap(page); 73 kaddr = kmap_atomic(page);
74 memcpy(iinfo->i_ext.i_data + iinfo->i_lenEAttr, kaddr, inode->i_size); 74 memcpy(iinfo->i_ext.i_data + iinfo->i_lenEAttr, kaddr, inode->i_size);
75 mark_inode_dirty(inode);
76 SetPageUptodate(page); 75 SetPageUptodate(page);
77 kunmap(page); 76 kunmap_atomic(kaddr);
77 mark_inode_dirty(inode);
78 unlock_page(page); 78 unlock_page(page);
79 79
80 return 0; 80 return 0;