diff options
author | rogersb11 <brettrogers11@gmail.com> | 2016-02-13 21:23:10 -0500 |
---|---|---|
committer | rogersb11 <brettrogers11@gmail.com> | 2016-02-13 21:23:21 -0500 |
commit | b9065b59218718f4cf77e67143a59264b4466b08 (patch) | |
tree | 3a8de0c4c31e0eeb94b6c9eaefaff6d5b41294fa | |
parent | 7c65ea7a446976b34ca8f0062f28f080a3b688da (diff) | |
download | kernel_samsung_smdk4412-b9065b59218718f4cf77e67143a59264b4466b08.zip kernel_samsung_smdk4412-b9065b59218718f4cf77e67143a59264b4466b08.tar.gz kernel_samsung_smdk4412-b9065b59218718f4cf77e67143a59264b4466b08.tar.bz2 |
Fix merge conflict
Change-Id: I311a4ca284237c557bdbfbc37d1929c905d3c059
-rw-r--r-- | fs/f2fs/checkpoint.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c index 0dcf88f..681782c 100644 --- a/fs/f2fs/checkpoint.c +++ b/fs/f2fs/checkpoint.c @@ -306,22 +306,25 @@ static void write_orphan_inodes(struct f2fs_sb_info *sbi, block_t start_blk) { struct list_head *head; struct f2fs_orphan_block *orphan_blk = NULL; - struct page *page = NULL; unsigned int nentries = 0; - unsigned short index = 1; - unsigned short orphan_blocks; + unsigned short index; + unsigned short orphan_blocks = (unsigned short)((sbi->n_orphans + + (F2FS_ORPHANS_PER_BLOCK - 1)) / F2FS_ORPHANS_PER_BLOCK); + struct page *page = NULL; + struct page *pages[orphan_blocks]; struct orphan_inode_entry *orphan = NULL; - orphan_blocks = (unsigned short)((sbi->n_orphans + - (F2FS_ORPHANS_PER_BLOCK - 1)) / F2FS_ORPHANS_PER_BLOCK); + for (index = 0; index < orphan_blocks; index++) + pages[index] = grab_meta_page(sbi, start_blk + index); + index = 1; mutex_lock(&sbi->orphan_inode_mutex); head = &sbi->orphan_inode_list; /* loop for each orphan inode entry and write them in Jornal block */ list_for_each_entry(orphan, head, list) { if (!page) { - page = grab_meta_page(sbi, start_blk); + page = pages[index - 1]; orphan_blk = (struct f2fs_orphan_block *)page_address(page); memset(orphan_blk, 0, sizeof(*orphan_blk)); @@ -341,7 +344,6 @@ static void write_orphan_inodes(struct f2fs_sb_info *sbi, block_t start_blk) set_page_dirty(page); f2fs_put_page(page, 1); index++; - start_blk++; nentries = 0; page = NULL; } |