linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Gao Xiang <gaoxiang25@huawei.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	<devel@driverdev.osuosl.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
	<linux-erofs@lists.ozlabs.org>, "Chao Yu" <yuchao0@huawei.com>,
	Miao Xie <miaoxie@huawei.com>, <weidu.du@huawei.com>,
	Gao Xiang <gaoxiang25@huawei.com>
Subject: [PATCH 6/8] staging: erofs: avoid magic constants when initializing clusterbits
Date: Fri, 14 Sep 2018 22:40:28 +0800	[thread overview]
Message-ID: <1536936030-62362-7-git-send-email-gaoxiang25@huawei.com> (raw)
In-Reply-To: <1536936030-62362-1-git-send-email-gaoxiang25@huawei.com>

Currently erofs only supports clustersize == blocksize.
and clustersize == 2^n * blocksize will be supported in the future.

Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
---
 drivers/staging/erofs/super.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/erofs/super.c b/drivers/staging/erofs/super.c
index 2109b03..9e42153 100644
--- a/drivers/staging/erofs/super.c
+++ b/drivers/staging/erofs/super.c
@@ -116,9 +116,10 @@ static int superblock_read(struct super_block *sb)
 #endif
 	sbi->islotbits = ffs(sizeof(struct erofs_inode_v1)) - 1;
 #ifdef CONFIG_EROFS_FS_ZIP
-	sbi->clusterbits = 12;
+	/* TODO: clusterbits should be related to inode */
+	sbi->clusterbits = blkszbits;
 
-	if (1 << (sbi->clusterbits - 12) > Z_EROFS_CLUSTER_MAX_PAGES)
+	if (1 << (sbi->clusterbits - PAGE_SHIFT) > Z_EROFS_CLUSTER_MAX_PAGES)
 		errln("clusterbits %u is not supported on this kernel",
 			sbi->clusterbits);
 #endif
-- 
1.9.1


  parent reply	other threads:[~2018-09-14 14:43 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-14 14:40 [PATCH 0/8] staging: erofs: error handing and more tracepoints Gao Xiang
2018-09-14 14:40 ` [PATCH 1/8] staging: erofs: fix a missing endian conversion Gao Xiang
2018-09-14 14:40 ` [PATCH 2/8] staging: erofs: clean up z_erofs_map_blocks_iter Gao Xiang
2018-09-14 14:40 ` [PATCH 3/8] staging: erofs: complete error handing of z_erofs_map_blocks_iter Gao Xiang
2018-09-14 14:40 ` [PATCH 4/8] staging: erofs: fix a bug when appling cache strategy Gao Xiang
2018-09-14 14:40 ` [PATCH 5/8] staging: erofs: complete error handing of z_erofs_do_read_page Gao Xiang
2018-09-14 14:40 ` Gao Xiang [this message]
2018-09-14 14:40 ` [PATCH 7/8] staging: erofs: add trace points for reading zipped data Gao Xiang
2018-09-14 14:40 ` [PATCH 8/8] staging: erofs: replace BUG_ON with DBG_BUGON in data.c Gao Xiang
2018-09-18 11:19 ` [PATCH 0/8] staging: erofs: error handing and more tracepoints Greg Kroah-Hartman
2018-09-18 12:02   ` Gao Xiang
2018-09-18 12:14     ` Greg Kroah-Hartman
2018-09-18 12:31       ` Gao Xiang
2018-09-18 13:03         ` Dan Carpenter
2018-09-18 13:09           ` Greg Kroah-Hartman
2018-09-18 13:20             ` Gao Xiang
2018-09-18 13:44             ` [PATCH] staging: erofs: initialize `pblk' with 0 first in `z_erofs_map_blocks_iter' Gao Xiang
2018-09-18 13:57               ` Greg Kroah-Hartman
2018-09-18 14:06                 ` 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=1536936030-62362-7-git-send-email-gaoxiang25@huawei.com \
    --to=gaoxiang25@huawei.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-erofs@lists.ozlabs.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=miaoxie@huawei.com \
    --cc=weidu.du@huawei.com \
    --cc=yuchao0@huawei.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).