From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D0C2EC4345F for ; Mon, 22 Apr 2024 00:35:58 +0000 (UTC) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=l5vyXNIO; dkim-atps=neutral Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4VN5rs2ZQjz3c2K for ; Mon, 22 Apr 2024 10:35:57 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=l5vyXNIO; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=2604:1380:4641:c500::1; helo=dfw.source.kernel.org; envelope-from=xiang@kernel.org; receiver=lists.ozlabs.org) Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4VN5rl4b9Pz2yk7 for ; Mon, 22 Apr 2024 10:35:51 +1000 (AEST) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 2AC8A60C3E; Mon, 22 Apr 2024 00:35:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F2E4EC3277B; Mon, 22 Apr 2024 00:35:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713746147; bh=fKEQxFHofuZRcWVDl6uEOJ9gXdYLZbAm5n9OBxFgQuc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l5vyXNIOHXiqrg2rTDC/4ClO6PpyvL3vQvWX+PhN7ytFr3OOfNz1HW+jtH2NI4+WW WWpmUekErETAHLDDSnZQEceUi3uyFuwICZlrS51D7CRiEvXrKgPd085oXd4/vxk5Jt g0TiLPJ9Vg/dnVj2l+ChKVjPY4cK5JYobCRVeDJXzN+2+d1UhUKYCv6w1AbDlfkEqr ONfRsApCrDa19W/GvtuLGXv5oeWMO8YXp37dT10orlIlbB+ZXvTCQt5g5Jdn9EvQpP Qvr+0rP0GEM7VCocC1hp2b3Mp1jrLi9PQ+ltUMRb69F4R3kiIooRB36wCaMjUsVit2 cvxsCHCW5OdVA== From: Gao Xiang To: linux-erofs@lists.ozlabs.org Subject: [PATCH v2 2/8] erofs-utils: lib: prepare for later deferred work Date: Mon, 22 Apr 2024 08:34:44 +0800 Message-Id: <20240422003450.19132-2-xiang@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20240422003450.19132-1-xiang@kernel.org> References: <20240422003450.19132-1-xiang@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: linux-erofs@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development of Linux EROFS file system List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gao Xiang Errors-To: linux-erofs-bounces+linux-erofs=archiver.kernel.org@lists.ozlabs.org Sender: "Linux-erofs" From: Gao Xiang Split out ordered metadata operations and add the following helpers: - erofs_mkfs_jobfn() - erofs_mkfs_go() to handle these mkfs job items for multi-threadding support. Signed-off-by: Gao Xiang --- lib/inode.c | 69 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 58 insertions(+), 11 deletions(-) diff --git a/lib/inode.c b/lib/inode.c index 55969d9..1ff05e1 100644 --- a/lib/inode.c +++ b/lib/inode.c @@ -1133,6 +1133,57 @@ static int erofs_mkfs_handle_nondirectory(struct erofs_inode *inode) return 0; } +enum erofs_mkfs_jobtype { /* ordered job types */ + EROFS_MKFS_JOB_NDIR, + EROFS_MKFS_JOB_DIR, + EROFS_MKFS_JOB_DIR_BH, +}; + +struct erofs_mkfs_jobitem { + enum erofs_mkfs_jobtype type; + union { + struct erofs_inode *inode; + } u; +}; + +static int erofs_mkfs_jobfn(struct erofs_mkfs_jobitem *item) +{ + struct erofs_inode *inode = item->u.inode; + int ret; + + if (item->type == EROFS_MKFS_JOB_NDIR) + return erofs_mkfs_handle_nondirectory(inode); + + if (item->type == EROFS_MKFS_JOB_DIR) { + ret = erofs_prepare_inode_buffer(inode); + if (ret) + return ret; + inode->bh->op = &erofs_skip_write_bhops; + if (IS_ROOT(inode)) /* assign root NID */ + erofs_fixup_meta_blkaddr(inode); + return 0; + } + + if (item->type == EROFS_MKFS_JOB_DIR_BH) { + erofs_write_dir_file(inode); + erofs_write_tail_end(inode); + inode->bh->op = &erofs_write_inode_bhops; + erofs_iput(inode); + return 0; + } + return -EINVAL; +} + +int erofs_mkfs_go(struct erofs_sb_info *sbi, + enum erofs_mkfs_jobtype type, void *elem, int size) +{ + struct erofs_mkfs_jobitem item; + + item.type = type; + memcpy(&item.u, elem, size); + return erofs_mkfs_jobfn(&item); +} + static int erofs_mkfs_handle_directory(struct erofs_inode *dir) { DIR *_dir; @@ -1213,11 +1264,7 @@ static int erofs_mkfs_handle_directory(struct erofs_inode *dir) else dir->i_nlink = i_nlink; - ret = erofs_prepare_inode_buffer(dir); - if (ret) - return ret; - dir->bh->op = &erofs_skip_write_bhops; - return 0; + return erofs_mkfs_go(dir->sbi, EROFS_MKFS_JOB_DIR, &dir, sizeof(dir)); err_closedir: closedir(_dir); @@ -1243,7 +1290,8 @@ static int erofs_mkfs_handle_inode(struct erofs_inode *inode) return ret; if (!S_ISDIR(inode->i_mode)) - ret = erofs_mkfs_handle_nondirectory(inode); + ret = erofs_mkfs_go(inode->sbi, EROFS_MKFS_JOB_NDIR, + &inode, sizeof(inode)); else ret = erofs_mkfs_handle_directory(inode); erofs_info("file %s dumped (mode %05o)", erofs_fspath(inode->i_srcpath), @@ -1268,7 +1316,6 @@ struct erofs_inode *erofs_mkfs_build_tree_from_path(const char *path) err = erofs_mkfs_handle_inode(root); if (err) return ERR_PTR(err); - erofs_fixup_meta_blkaddr(root); do { int err; @@ -1302,10 +1349,10 @@ struct erofs_inode *erofs_mkfs_build_tree_from_path(const char *path) } *last = dumpdir; /* fixup the last (or the only) one */ dumpdir = head; - erofs_write_dir_file(dir); - erofs_write_tail_end(dir); - dir->bh->op = &erofs_write_inode_bhops; - erofs_iput(dir); + err = erofs_mkfs_go(dir->sbi, EROFS_MKFS_JOB_DIR_BH, + &dir, sizeof(dir)); + if (err) + return ERR_PTR(err); } while (dumpdir); return root; -- 2.30.2