linux-erofs.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Yue Hu <zbestahu@gmail.com>
To: linux-erofs@lists.ozlabs.org, xiang@kernel.org
Cc: huyue2@yulong.com, zbestahu@163.com
Subject: [PATCH] erofs-utils: do not check ->idata_size for compressed files in erofs_prepare_inode_buffer()
Date: Thu, 17 Jun 2021 16:29:54 +0800	[thread overview]
Message-ID: <20210617082954.1001-1-zbestahu@gmail.com> (raw)

From: Yue Hu <huyue2@yulong.com>

erofs_write_compressed_file() will always set inode->idata_size = 0
if succeed, that means no tail-end data for compressed files. So, no
need to call erofs_prepare_tail_block() which is used to handle
tail-end data for that case. Just skip it.

Also, correct 'a inode' -> 'an inode'.

Signed-off-by: Yue Hu <huyue2@yulong.com>
---
 lib/inode.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/inode.c b/lib/inode.c
index b6108db..b5f66de 100644
--- a/lib/inode.c
+++ b/lib/inode.c
@@ -111,7 +111,7 @@ struct erofs_dentry *erofs_d_alloc(struct erofs_inode *parent,
 	return d;
 }
 
-/* allocate main data for a inode */
+/* allocate main data for an inode */
 static int __allocate_inode_bh_data(struct erofs_inode *inode,
 				    unsigned long nblocks)
 {
@@ -572,11 +572,11 @@ static int erofs_prepare_inode_buffer(struct erofs_inode *inode)
 		int ret;
 
 		inode->datalayout = EROFS_INODE_FLAT_PLAIN;
-noinline:
 		/* expend an extra block for tail-end data */
 		ret = erofs_prepare_tail_block(inode);
 		if (ret)
 			return ret;
+noinline:
 		bh = erofs_balloc(INODE, inodesize, 0, 0);
 		if (IS_ERR(bh))
 			return PTR_ERR(bh);
-- 
1.9.1


             reply	other threads:[~2021-06-17  8:32 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-17  8:29 Yue Hu [this message]
2021-06-17  9:04 ` [PATCH] erofs-utils: do not check ->idata_size for compressed files in erofs_prepare_inode_buffer() Gao Xiang
2021-06-17  9:15   ` Yue Hu
2021-06-17  9:27     ` Gao Xiang
2021-06-17  9:30       ` Gao Xiang
2021-06-17 10:14         ` Yue Hu
2021-08-31  9:00           ` Yue Hu
2021-08-31 11:15             ` Gao Xiang
2021-08-31 11:56               ` Yue Hu
2021-08-31 12:20                 ` Gao Xiang
2021-09-01  2:20                   ` Yue Hu
2021-09-01  3:05                     ` Gao Xiang

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=20210617082954.1001-1-zbestahu@gmail.com \
    --to=zbestahu@gmail.com \
    --cc=huyue2@yulong.com \
    --cc=linux-erofs@lists.ozlabs.org \
    --cc=xiang@kernel.org \
    --cc=zbestahu@163.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).