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 A6876C4345F for ; Mon, 22 Apr 2024 00:36:34 +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=mcYY2aHM; dkim-atps=neutral Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4VN5sY2KQrz3cHH for ; Mon, 22 Apr 2024 10:36:33 +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=mcYY2aHM; 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)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4VN5sB5n4dz3cV6 for ; Mon, 22 Apr 2024 10:36:14 +1000 (AEST) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 0AFF360C07; Mon, 22 Apr 2024 00:36:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E1AABC32783; Mon, 22 Apr 2024 00:36:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713746172; bh=V3cyPGrQ5w31vzHDznG6GA9+P1qQYYYcNyWEhHRgWbw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mcYY2aHMgIe7RL0EOpUimTuYhCbJfsoGpeyFWsuayapccw1qPfNuOeCWIgqAEEL0D lPt3Kv6nHj3jrx6KjcdeB8IJX5KcRGHwrIXSGhLMeaHvPwrHVtsMJ9+nH6+KXFC9P9 4RWp5dg4CvXlDn69VD+PpMQMeKw51V4ZhnSQfcAR5wqGjWuCHsgyLd5V1TxbWK7TEk 133vC5TShzeVgynG3LBZqZE9wPgbMe8/ItDd8uUpN7VjQK2kTRy1FOnkB+O08HCnu+ WXrFIoU0efvXq/aPRk5FvrDa85dj1g5GBR7eUFqrqeJFh2Sf/X1BEVvUwntKeYpwnp 3JuTzgYkNvviQ== From: Gao Xiang To: linux-erofs@lists.ozlabs.org Subject: [PATCH v2 7/8] erofs-utils: lib: introduce non-directory jobitem context Date: Mon, 22 Apr 2024 08:34:49 +0800 Message-Id: <20240422003450.19132-7-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 It will describe EROFS_MKFS_JOB_NDIR defer work. Also, start compression before queueing EROFS_MKFS_JOB_NDIR. Signed-off-by: Gao Xiang --- lib/inode.c | 62 +++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 51 insertions(+), 11 deletions(-) diff --git a/lib/inode.c b/lib/inode.c index 0d044f4..6ad66bf 100644 --- a/lib/inode.c +++ b/lib/inode.c @@ -1107,8 +1107,36 @@ static void erofs_fixup_meta_blkaddr(struct erofs_inode *rootdir) rootdir->nid = (off - meta_offset) >> EROFS_ISLOTBITS; } -static int erofs_mkfs_handle_nondirectory(struct erofs_inode *inode) +struct erofs_mkfs_job_ndir_ctx { + struct erofs_inode *inode; + void *ictx; + int fd; +}; + +static int erofs_mkfs_job_write_file(struct erofs_mkfs_job_ndir_ctx *ctx) { + struct erofs_inode *inode = ctx->inode; + int ret; + + if (ctx->ictx) { + ret = erofs_write_compressed_file(ctx->ictx); + if (ret != -ENOSPC) + goto out; + if (lseek(ctx->fd, 0, SEEK_SET) < 0) { + ret = -errno; + goto out; + } + } + /* fallback to all data uncompressed */ + ret = erofs_write_unencoded_file(inode, ctx->fd, 0); +out: + close(ctx->fd); + return ret; +} + +static int erofs_mkfs_handle_nondirectory(struct erofs_mkfs_job_ndir_ctx *ctx) +{ + struct erofs_inode *inode = ctx->inode; int ret = 0; if (S_ISLNK(inode->i_mode)) { @@ -1124,12 +1152,7 @@ static int erofs_mkfs_handle_nondirectory(struct erofs_inode *inode) ret = erofs_write_file_from_buffer(inode, symlink); free(symlink); } else if (inode->i_size) { - int fd = open(inode->i_srcpath, O_RDONLY | O_BINARY); - - if (fd < 0) - return -errno; - ret = erofs_write_file(inode, fd, 0); - close(fd); + ret = erofs_mkfs_job_write_file(ctx); } if (ret) return ret; @@ -1148,6 +1171,7 @@ struct erofs_mkfs_jobitem { enum erofs_mkfs_jobtype type; union { struct erofs_inode *inode; + struct erofs_mkfs_job_ndir_ctx ndir; } u; }; @@ -1157,7 +1181,7 @@ static int erofs_mkfs_jobfn(struct erofs_mkfs_jobitem *item) int ret; if (item->type == EROFS_MKFS_JOB_NDIR) - return erofs_mkfs_handle_nondirectory(inode); + return erofs_mkfs_handle_nondirectory(&item->u.ndir); if (item->type == EROFS_MKFS_JOB_DIR) { ret = erofs_prepare_inode_buffer(inode); @@ -1294,11 +1318,27 @@ static int erofs_mkfs_handle_inode(struct erofs_inode *inode) if (ret < 0) return ret; - if (!S_ISDIR(inode->i_mode)) + if (!S_ISDIR(inode->i_mode)) { + struct erofs_mkfs_job_ndir_ctx ctx = { .inode = inode }; + + if (!S_ISLNK(inode->i_mode) && inode->i_size) { + ctx.fd = open(inode->i_srcpath, O_RDONLY | O_BINARY); + if (ctx.fd < 0) + return -errno; + + if (cfg.c_compr_opts[0].alg && + erofs_file_is_compressible(inode)) { + ctx.ictx = erofs_begin_compressed_file(inode, + ctx.fd, 0); + if (IS_ERR(ctx.ictx)) + return PTR_ERR(ctx.ictx); + } + } ret = erofs_mkfs_go(inode->sbi, EROFS_MKFS_JOB_NDIR, - &inode, sizeof(inode)); - else + &ctx, sizeof(ctx)); + } else { ret = erofs_mkfs_handle_directory(inode); + } erofs_info("file %s dumped (mode %05o)", erofs_fspath(inode->i_srcpath), inode->i_mode); return ret; -- 2.30.2