aboutsummaryrefslogtreecommitdiffstats
path: root/fs/f2fs/segment.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/f2fs/segment.c')
-rw-r--r--fs/f2fs/segment.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 6f16b39f0b52..540669d6978e 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -885,12 +885,12 @@ int npages_for_summary_flush(struct f2fs_sb_info *sbi, bool for_ra)
885 } 885 }
886 } 886 }
887 887
888 sum_in_page = (PAGE_CACHE_SIZE - 2 * SUM_JOURNAL_SIZE - 888 sum_in_page = (PAGE_SIZE - 2 * SUM_JOURNAL_SIZE -
889 SUM_FOOTER_SIZE) / SUMMARY_SIZE; 889 SUM_FOOTER_SIZE) / SUMMARY_SIZE;
890 if (valid_sum_count <= sum_in_page) 890 if (valid_sum_count <= sum_in_page)
891 return 1; 891 return 1;
892 else if ((valid_sum_count - sum_in_page) <= 892 else if ((valid_sum_count - sum_in_page) <=
893 (PAGE_CACHE_SIZE - SUM_FOOTER_SIZE) / SUMMARY_SIZE) 893 (PAGE_SIZE - SUM_FOOTER_SIZE) / SUMMARY_SIZE)
894 return 2; 894 return 2;
895 return 3; 895 return 3;
896} 896}
@@ -909,9 +909,9 @@ void update_meta_page(struct f2fs_sb_info *sbi, void *src, block_t blk_addr)
909 void *dst = page_address(page); 909 void *dst = page_address(page);
910 910
911 if (src) 911 if (src)
912 memcpy(dst, src, PAGE_CACHE_SIZE); 912 memcpy(dst, src, PAGE_SIZE);
913 else 913 else
914 memset(dst, 0, PAGE_CACHE_SIZE); 914 memset(dst, 0, PAGE_SIZE);
915 set_page_dirty(page); 915 set_page_dirty(page);
916 f2fs_put_page(page, 1); 916 f2fs_put_page(page, 1);
917} 917}
@@ -1596,7 +1596,7 @@ static int read_compacted_summaries(struct f2fs_sb_info *sbi)
1596 s = (struct f2fs_summary *)(kaddr + offset); 1596 s = (struct f2fs_summary *)(kaddr + offset);
1597 seg_i->sum_blk->entries[j] = *s; 1597 seg_i->sum_blk->entries[j] = *s;
1598 offset += SUMMARY_SIZE; 1598 offset += SUMMARY_SIZE;
1599 if (offset + SUMMARY_SIZE <= PAGE_CACHE_SIZE - 1599 if (offset + SUMMARY_SIZE <= PAGE_SIZE -
1600 SUM_FOOTER_SIZE) 1600 SUM_FOOTER_SIZE)
1601 continue; 1601 continue;
1602 1602
@@ -1757,7 +1757,7 @@ static void write_compacted_summaries(struct f2fs_sb_info *sbi, block_t blkaddr)
1757 *summary = seg_i->sum_blk->entries[j]; 1757 *summary = seg_i->sum_blk->entries[j];
1758 written_size += SUMMARY_SIZE; 1758 written_size += SUMMARY_SIZE;
1759 1759
1760 if (written_size + SUMMARY_SIZE <= PAGE_CACHE_SIZE - 1760 if (written_size + SUMMARY_SIZE <= PAGE_SIZE -
1761 SUM_FOOTER_SIZE) 1761 SUM_FOOTER_SIZE)
1762 continue; 1762 continue;
1763 1763
@@ -1844,7 +1844,7 @@ static struct page *get_next_sit_page(struct f2fs_sb_info *sbi,
1844 1844
1845 src_addr = page_address(src_page); 1845 src_addr = page_address(src_page);
1846 dst_addr = page_address(dst_page); 1846 dst_addr = page_address(dst_page);
1847 memcpy(dst_addr, src_addr, PAGE_CACHE_SIZE); 1847 memcpy(dst_addr, src_addr, PAGE_SIZE);
1848 1848
1849 set_page_dirty(dst_page); 1849 set_page_dirty(dst_page);
1850 f2fs_put_page(src_page, 1); 1850 f2fs_put_page(src_page, 1);
@@ -2171,7 +2171,7 @@ static int build_curseg(struct f2fs_sb_info *sbi)
2171 2171
2172 for (i = 0; i < NR_CURSEG_TYPE; i++) { 2172 for (i = 0; i < NR_CURSEG_TYPE; i++) {
2173 mutex_init(&array[i].curseg_mutex); 2173 mutex_init(&array[i].curseg_mutex);
2174 array[i].sum_blk = kzalloc(PAGE_CACHE_SIZE, GFP_KERNEL); 2174 array[i].sum_blk = kzalloc(PAGE_SIZE, GFP_KERNEL);
2175 if (!array[i].sum_blk) 2175 if (!array[i].sum_blk)
2176 return -ENOMEM; 2176 return -ENOMEM;
2177 init_rwsem(&array[i].journal_rwsem); 2177 init_rwsem(&array[i].journal_rwsem);