From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932402AbcAZHjb (ORCPT ); Tue, 26 Jan 2016 02:39:31 -0500 Received: from mailout1.samsung.com ([203.254.224.24]:60126 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755421AbcAZHj1 (ORCPT ); Tue, 26 Jan 2016 02:39:27 -0500 X-AuditID: cbfee61b-f793c6d00000236c-78-56a722aebdd8 From: Chao Yu To: Jaegeuk Kim Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/3] f2fs: simplify __allocate_data_blocks Date: Tue, 26 Jan 2016 15:38:29 +0800 Message-id: <009301d1580c$ae03ee00$0a0bca00$@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7bit X-Mailer: Microsoft Outlook 14.0 Thread-index: AdFYDHncWo3zkCZLT56q0Dbkczdx3g== Content-language: zh-cn X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrNLMWRmVeSWpSXmKPExsVy+t9jAd11SsvDDO7eUrV4sn4Ws8WlRe4W l3fNYXNg9ti0qpPNY/eCz0wenzfJBTBHcdmkpOZklqUW6dslcGU8nnGbpWCnQEXLjPXsDYyt vF2MnBwSAiYS32b0MEPYYhIX7q1nA7GFBJYySrw/pdDFyAVkv2KU+LHqGAtIgk1ARWJ5x38m EFsEyD606DI7iM0s4CHR2PGdFcQWFrCVePd5JZjNIqAqceDwdEYQm1fAUuLt5s1QtqDEj8n3 WCB6tSTW7zzOBGHLS2xe8xbqIAWJHWdfM0Ls0pNY8eoz1C5xiY1HbrFMYBSYhWTULCSjZiEZ NQtJywJGllWMEqkFyQXFSem5Rnmp5XrFibnFpXnpesn5uZsYwUH8THoH4+Fd7ocYBTgYlXh4 NxQsCxNiTSwrrsw9xCjBwawkwqvEuzxMiDclsbIqtSg/vqg0J7X4EKM0B4uSOO++S5FhQgLp iSWp2ampBalFMFkmDk6pBkbJif4JH8rZshRWGwj2b7KZ88U90fjWogqFgA+z3j9k2Rs+UXnZ A8c/hRFHpPc9LjvOtutQYzgDa410Mqsa162Dh5Ycf7bBMcTvlM7BTTZGO/azBTeuluHxT2nZ J1lznqOlf3vIFSfx969vMW9dwFR549gFa82klE/tie8TT2rcmO+bfPgOc5cSS3FGoqEWc1Fx IgA0lnzqXgIAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch uses existing function f2fs_map_block to simplify implementation of __allocate_data_blocks. Signed-off-by: Chao Yu --- V2: - rebase on last dev-test. fs/f2fs/data.c | 60 ++++------------------------------------------------------ 1 file changed, 4 insertions(+), 56 deletions(-) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index f570d37..2f8ecfe 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -537,64 +537,12 @@ alloc: static int __allocate_data_blocks(struct inode *inode, loff_t offset, size_t count) { - struct f2fs_sb_info *sbi = F2FS_I_SB(inode); - struct dnode_of_data dn; - u64 start = F2FS_BYTES_TO_BLK(offset); - u64 len = F2FS_BYTES_TO_BLK(count); - bool allocated = false; - u64 end_offset; - int err = 0; - - while (len) { - f2fs_lock_op(sbi); - - /* When reading holes, we need its node page */ - set_new_dnode(&dn, inode, NULL, NULL, 0); - err = get_dnode_of_data(&dn, start, ALLOC_NODE); - if (err) - goto out; - - allocated = false; - end_offset = ADDRS_PER_PAGE(dn.node_page, F2FS_I(inode)); - - while (dn.ofs_in_node < end_offset && len) { - block_t blkaddr; - - if (unlikely(f2fs_cp_error(sbi))) { - err = -EIO; - goto sync_out; - } - - blkaddr = datablock_addr(dn.node_page, dn.ofs_in_node); - if (blkaddr == NULL_ADDR || blkaddr == NEW_ADDR) { - err = __allocate_data_block(&dn); - if (err) - goto sync_out; - allocated = true; - } - len--; - start++; - dn.ofs_in_node++; - } - - if (allocated) - sync_inode_page(&dn); - - f2fs_put_dnode(&dn); - f2fs_unlock_op(sbi); + struct f2fs_map_blocks map; - f2fs_balance_fs(sbi, allocated); - } - return err; + map.m_lblk = F2FS_BYTES_TO_BLK(offset); + map.m_len = F2FS_BYTES_TO_BLK(count); -sync_out: - if (allocated) - sync_inode_page(&dn); - f2fs_put_dnode(&dn); -out: - f2fs_unlock_op(sbi); - f2fs_balance_fs(sbi, allocated); - return err; + return f2fs_map_blocks(inode, &map, 1, F2FS_GET_BLOCK_DIO); } /* -- 2.7.0.2.g1b0b6dd