diff options
Diffstat (limited to 'fs/udf')
-rw-r--r-- | fs/udf/file.c | 6 | ||||
-rw-r--r-- | fs/udf/inode.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/fs/udf/file.c b/fs/udf/file.c index 1af98963d860..877ba1c9b461 100644 --- a/fs/udf/file.c +++ b/fs/udf/file.c | |||
@@ -46,7 +46,7 @@ static void __udf_adinicb_readpage(struct page *page) | |||
46 | 46 | ||
47 | kaddr = kmap(page); | 47 | kaddr = kmap(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_CACHE_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(page); |
@@ -87,14 +87,14 @@ static int udf_adinicb_write_begin(struct file *file, | |||
87 | { | 87 | { |
88 | struct page *page; | 88 | struct page *page; |
89 | 89 | ||
90 | if (WARN_ON_ONCE(pos >= PAGE_CACHE_SIZE)) | 90 | if (WARN_ON_ONCE(pos >= PAGE_SIZE)) |
91 | return -EIO; | 91 | return -EIO; |
92 | page = grab_cache_page_write_begin(mapping, 0, flags); | 92 | page = grab_cache_page_write_begin(mapping, 0, flags); |
93 | if (!page) | 93 | if (!page) |
94 | return -ENOMEM; | 94 | return -ENOMEM; |
95 | *pagep = page; | 95 | *pagep = page; |
96 | 96 | ||
97 | if (!PageUptodate(page) && len != PAGE_CACHE_SIZE) | 97 | if (!PageUptodate(page) && len != PAGE_SIZE) |
98 | __udf_adinicb_readpage(page); | 98 | __udf_adinicb_readpage(page); |
99 | return 0; | 99 | return 0; |
100 | } | 100 | } |
diff --git a/fs/udf/inode.c b/fs/udf/inode.c index 166d3ed32c39..2dc461eeb415 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c | |||
@@ -287,7 +287,7 @@ int udf_expand_file_adinicb(struct inode *inode) | |||
287 | if (!PageUptodate(page)) { | 287 | if (!PageUptodate(page)) { |
288 | kaddr = kmap(page); | 288 | kaddr = kmap(page); |
289 | memset(kaddr + iinfo->i_lenAlloc, 0x00, | 289 | memset(kaddr + iinfo->i_lenAlloc, 0x00, |
290 | PAGE_CACHE_SIZE - iinfo->i_lenAlloc); | 290 | PAGE_SIZE - iinfo->i_lenAlloc); |
291 | memcpy(kaddr, iinfo->i_ext.i_data + iinfo->i_lenEAttr, | 291 | memcpy(kaddr, iinfo->i_ext.i_data + iinfo->i_lenEAttr, |
292 | iinfo->i_lenAlloc); | 292 | iinfo->i_lenAlloc); |
293 | flush_dcache_page(page); | 293 | flush_dcache_page(page); |
@@ -319,7 +319,7 @@ int udf_expand_file_adinicb(struct inode *inode) | |||
319 | inode->i_data.a_ops = &udf_adinicb_aops; | 319 | inode->i_data.a_ops = &udf_adinicb_aops; |
320 | up_write(&iinfo->i_data_sem); | 320 | up_write(&iinfo->i_data_sem); |
321 | } | 321 | } |
322 | page_cache_release(page); | 322 | put_page(page); |
323 | mark_inode_dirty(inode); | 323 | mark_inode_dirty(inode); |
324 | 324 | ||
325 | return err; | 325 | return err; |