From: Gao Xiang via Linux-erofs <linux-erofs@lists.ozlabs.org>
To: linux-erofs@lists.ozlabs.org
Cc: Zhang Shiming <zhangshiming@oppo.com>, Guo Weichao <guoweichao@oppo.com>
Subject: [WIP] [PATCH 09/12] erofs-utils: fuse: rename ofs_head and outputsize
Date: Sat, 17 Oct 2020 13:16:18 +0800 [thread overview]
Message-ID: <20201017051621.7810-10-hsiangkao@aol.com> (raw)
In-Reply-To: <20201017051621.7810-1-hsiangkao@aol.com>
[ let's fold in to the original patch. ]
Signed-off-by: Gao Xiang <hsiangkao@aol.com>
---
fuse/decompress.c | 27 +++++++++++++--------------
fuse/decompress.h | 8 ++++++--
fuse/read.c | 4 ++--
3 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/fuse/decompress.c b/fuse/decompress.c
index d3ee3677e9a3..fc12852ac6b7 100644
--- a/fuse/decompress.c
+++ b/fuse/decompress.c
@@ -33,8 +33,8 @@ static int z_erofs_decompress_generic(struct z_erofs_decompress_req *rq)
return -EIO;
}
- if (rq->ofs_head) {
- buff = malloc(rq->outputsize);
+ if (rq->decodedskip) {
+ buff = malloc(rq->decodedlength);
if (!buff)
return -ENOMEM;
dest = buff;
@@ -42,22 +42,21 @@ static int z_erofs_decompress_generic(struct z_erofs_decompress_req *rq)
if (rq->partial_decoding || !support_0padding)
ret = LZ4_decompress_safe_partial(src + inputmargin, dest,
- rq->inputsize - inputmargin,
- rq->outputsize, rq->outputsize);
+ rq->inputsize - inputmargin,
+ rq->decodedlength, rq->decodedlength);
else
ret = LZ4_decompress_safe(src + inputmargin, dest,
rq->inputsize - inputmargin,
- rq->outputsize);
+ rq->decodedlength);
- if (ret != (int)rq->outputsize) {
+ if (ret != (int)rq->decodedlength) {
ret = -EIO;
goto out;
}
- if (rq->ofs_head) {
- src = dest + rq->ofs_head;
- memcpy(rq->out, src, rq->outputsize - rq->ofs_head);
- }
+ if (rq->decodedskip)
+ memcpy(rq->out, dest + rq->decodedskip,
+ rq->decodedlength - rq->decodedskip);
out:
if (buff)
@@ -72,11 +71,11 @@ int z_erofs_decompress(struct z_erofs_decompress_req *rq)
if (rq->inputsize != EROFS_BLKSIZ)
return -EFSCORRUPTED;
- DBG_BUGON(rq->outputsize > EROFS_BLKSIZ);
- DBG_BUGON(rq->outputsize < rq->ofs_head);
+ DBG_BUGON(rq->decodedlength > EROFS_BLKSIZ);
+ DBG_BUGON(rq->decodedlength < rq->decodedskip);
- memcpy(rq->out, rq->in + rq->ofs_head,
- rq->outputsize - rq->ofs_head);
+ memcpy(rq->out, rq->in + rq->decodedskip,
+ rq->decodedlength - rq->decodedskip);
return 0;
}
diff --git a/fuse/decompress.h b/fuse/decompress.h
index 5a3e2356dc1b..7d436f18da86 100644
--- a/fuse/decompress.h
+++ b/fuse/decompress.h
@@ -17,8 +17,12 @@ enum {
struct z_erofs_decompress_req {
char *in, *out;
- size_t ofs_head;
- unsigned int inputsize, outputsize;
+ /*
+ * initial decompressed bytes that need to be skipped
+ * when finally copying to output buffer
+ */
+ unsigned int decodedskip;
+ unsigned int inputsize, decodedlength;
/* indicate the algorithm will be used for decompression */
unsigned int alg;
diff --git a/fuse/read.c b/fuse/read.c
index 06ca08587e7c..46be5cc64a90 100644
--- a/fuse/read.c
+++ b/fuse/read.c
@@ -136,9 +136,9 @@ size_t erofs_read_data_compression(struct erofs_vnode *vnode, char *buffer,
ret = z_erofs_decompress(&(struct z_erofs_decompress_req) {
.in = raw,
.out = buffer + sum,
- .ofs_head = ofs,
+ .decodedskip = ofs,
.inputsize = EROFS_BLKSIZ,
- .outputsize = count,
+ .decodedlength = count,
.alg = algorithmformat,
.partial_decoding = partial
});
--
2.24.0
next prev parent reply other threads:[~2020-10-17 5:18 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20201017051621.7810-1-hsiangkao.ref@aol.com>
2020-10-17 5:16 ` [WIP] [PATCH 00/12] erofs-utils: introduce fuse implementation Gao Xiang via Linux-erofs
2020-10-17 5:16 ` [WIP] [PATCH 01/12] " Gao Xiang via Linux-erofs
2020-10-17 5:16 ` [WIP] [PATCH 02/12] erofs-utils: fuse: support read special file Gao Xiang via Linux-erofs
2020-10-17 5:16 ` [WIP] [PATCH 03/12] erofs-utils: fuse: support read compressed file Gao Xiang via Linux-erofs
2020-10-17 5:16 ` [WIP] [PATCH 04/12] erofs-utils: fuse: adjust larger extent handling Gao Xiang via Linux-erofs
2020-10-19 3:13 ` 回复: " huangjianan
2020-10-19 3:32 ` Gao Xiang via Linux-erofs
2020-10-19 4:49 ` 回复: " Huang Jianan
2020-10-19 3:37 ` 回复: " Huang Jianan
2020-10-19 3:43 ` Gao Xiang via Linux-erofs
2020-10-17 5:16 ` [WIP] [PATCH 05/12] erofs-utils: fuse: use proper expression about inode size Gao Xiang via Linux-erofs
2020-10-17 5:16 ` [WIP] [PATCH 06/12] erofs-utils: fuse: drop ofs_out Gao Xiang via Linux-erofs
2020-10-17 5:16 ` [WIP] [PATCH 07/12] erofs-utils: fuse: refuse a undefined shifted cluster behavior Gao Xiang via Linux-erofs
2020-10-17 5:16 ` [WIP] [PATCH 08/12] erofs-utils: fuse: drop z_erofs_shifted_transform() Gao Xiang via Linux-erofs
2020-10-17 5:16 ` Gao Xiang via Linux-erofs [this message]
2020-10-17 5:16 ` [WIP] [PATCH 10/12] erofs-utils: fuse: cleanup erofs_read_data_compression() Gao Xiang via Linux-erofs
2020-10-17 5:16 ` [WIP] [PATCH 11/12] erofs-utils: fuse: move up mpage in struct erofs_map_blocks Gao Xiang via Linux-erofs
2020-10-17 5:16 ` [WIP] [PATCH 12/12] erofs-utils: fuse: fix up source headers Gao Xiang via Linux-erofs
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201017051621.7810-10-hsiangkao@aol.com \
--to=linux-erofs@lists.ozlabs.org \
--cc=guoweichao@oppo.com \
--cc=hsiangkao@aol.com \
--cc=zhangshiming@oppo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).