projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'mac80211-for-davem-2016-04-27' of git://git.kernel.org/pub/scm/linux/kerne...
[linux-2.6-microblaze.git]
/
fs
/
f2fs
/
inline.c
diff --git
a/fs/f2fs/inline.c
b/fs/f2fs/inline.c
index
358214e
..
a2fbe6f
100644
(file)
--- a/
fs/f2fs/inline.c
+++ b/
fs/f2fs/inline.c
@@
-51,7
+51,7
@@
void read_inline_data(struct page *page, struct page *ipage)
f2fs_bug_on(F2FS_P_SB(page), page->index);
f2fs_bug_on(F2FS_P_SB(page), page->index);
- zero_user_segment(page, MAX_INLINE_DATA, PAGE_
CACHE_
SIZE);
+ zero_user_segment(page, MAX_INLINE_DATA, PAGE_SIZE);
/* Copy the whole inline data block */
src_addr = inline_data_addr(ipage);
/* Copy the whole inline data block */
src_addr = inline_data_addr(ipage);
@@
-93,7
+93,7
@@
int f2fs_read_inline_data(struct inode *inode, struct page *page)
}
if (page->index)
}
if (page->index)
- zero_user_segment(page, 0, PAGE_
CACHE_
SIZE);
+ zero_user_segment(page, 0, PAGE_SIZE);
else
read_inline_data(page, ipage);
else
read_inline_data(page, ipage);
@@
-375,7
+375,7
@@
static int f2fs_convert_inline_dir(struct inode *dir, struct page *ipage,
goto out;
f2fs_wait_on_page_writeback(page, DATA, true);
goto out;
f2fs_wait_on_page_writeback(page, DATA, true);
- zero_user_segment(page, MAX_INLINE_DATA, PAGE_
CACHE_
SIZE);
+ zero_user_segment(page, MAX_INLINE_DATA, PAGE_SIZE);
dentry_blk = kmap_atomic(page);
dentry_blk = kmap_atomic(page);
@@
-405,8
+405,8
@@
static int f2fs_convert_inline_dir(struct inode *dir, struct page *ipage,
stat_dec_inline_dir(dir);
clear_inode_flag(F2FS_I(dir), FI_INLINE_DENTRY);
stat_dec_inline_dir(dir);
clear_inode_flag(F2FS_I(dir), FI_INLINE_DENTRY);
- if (i_size_read(dir) < PAGE_
CACHE_
SIZE) {
- i_size_write(dir, PAGE_
CACHE_
SIZE);
+ if (i_size_read(dir) < PAGE_SIZE) {
+ i_size_write(dir, PAGE_SIZE);
set_inode_flag(F2FS_I(dir), FI_UPDATE_DIR);
}
set_inode_flag(F2FS_I(dir), FI_UPDATE_DIR);
}