* [PATCH 0/5] erofs-utils: fix checkpatch.pl complains
@ 2021-08-31 16:51 Huang Jianan
2021-08-31 16:51 ` [PATCH 1/5] erofs-utils: remove filename in the file Huang Jianan
` (5 more replies)
0 siblings, 6 replies; 21+ messages in thread
From: Huang Jianan @ 2021-08-31 16:51 UTC (permalink / raw)
To: linux-erofs
From: Huang Jianan <huangjianan@oppo.com>
This patchset fix most of checkpatch.pl complains in erofs-utils, some
problems that also exist in the kernel haven't been fixed.
Huang Jianan (5):
erofs-utils: remove filename in the file
erofs-utils: fix SPDX comment style
erofs-utils: fix general style problem
erofs-utils: remove unnecessary codes and comments
erofs-utils: fix print style
Makefile.am | 1 -
fuse/Makefile.am | 1 -
fuse/dir.c | 2 --
fuse/macosx.h | 1 +
fuse/main.c | 7 +------
include/erofs/block_list.h | 8 +++-----
include/erofs/cache.h | 2 --
include/erofs/compress.h | 2 --
include/erofs/config.h | 2 --
include/erofs/decompress.h | 2 --
include/erofs/defs.h | 2 --
include/erofs/err.h | 2 --
include/erofs/exclude.h | 2 --
include/erofs/hashtable.h | 2 --
include/erofs/inode.h | 2 --
include/erofs/internal.h | 2 --
include/erofs/io.h | 2 --
include/erofs/list.h | 2 --
include/erofs/print.h | 2 --
include/erofs/trace.h | 2 --
include/erofs/xattr.h | 4 +---
include/erofs_fs.h | 1 -
lib/Makefile.am | 1 -
lib/block_list.c | 7 +------
lib/cache.c | 2 --
lib/compress.c | 11 ++++-------
lib/compressor.c | 4 +---
lib/compressor.h | 2 --
lib/compressor_lz4.c | 2 --
lib/compressor_lz4hc.c | 2 --
lib/config.c | 2 --
lib/data.c | 2 --
lib/decompress.c | 2 --
lib/exclude.c | 2 --
lib/inode.c | 9 +--------
lib/io.c | 5 +----
lib/namei.c | 5 ++---
lib/super.c | 2 --
lib/xattr.c | 4 +---
lib/zmap.c | 6 +-----
man/Makefile.am | 1 -
mkfs/Makefile.am | 1 -
mkfs/main.c | 4 +---
43 files changed, 19 insertions(+), 110 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH 1/5] erofs-utils: remove filename in the file
2021-08-31 16:51 [PATCH 0/5] erofs-utils: fix checkpatch.pl complains Huang Jianan
@ 2021-08-31 16:51 ` Huang Jianan
2021-09-03 3:09 ` Gao Xiang
2021-08-31 16:51 ` [PATCH 2/5] erofs-utils: fix SPDX comment style Huang Jianan
` (4 subsequent siblings)
5 siblings, 1 reply; 21+ messages in thread
From: Huang Jianan @ 2021-08-31 16:51 UTC (permalink / raw)
To: linux-erofs
From: Huang Jianan <huangjianan@oppo.com>
It's generally not useful to have the filename in the file.
Signed-off-by: Huang Jianan <huangjianan@oppo.com>
---
Makefile.am | 1 -
fuse/Makefile.am | 1 -
fuse/dir.c | 2 --
fuse/main.c | 2 --
include/erofs/block_list.h | 2 --
include/erofs/cache.h | 2 --
include/erofs/compress.h | 2 --
include/erofs/config.h | 2 --
include/erofs/decompress.h | 2 --
include/erofs/defs.h | 2 --
include/erofs/err.h | 2 --
include/erofs/exclude.h | 2 --
include/erofs/hashtable.h | 2 --
include/erofs/inode.h | 2 --
include/erofs/internal.h | 2 --
include/erofs/io.h | 2 --
include/erofs/list.h | 2 --
include/erofs/print.h | 2 --
include/erofs/trace.h | 2 --
include/erofs/xattr.h | 2 --
include/erofs_fs.h | 1 -
lib/Makefile.am | 1 -
lib/block_list.c | 2 --
lib/cache.c | 2 --
lib/compress.c | 2 --
lib/compressor.c | 2 --
lib/compressor.h | 2 --
lib/compressor_lz4.c | 2 --
lib/compressor_lz4hc.c | 2 --
lib/config.c | 2 --
lib/data.c | 2 --
lib/decompress.c | 2 --
lib/exclude.c | 2 --
lib/inode.c | 2 --
lib/io.c | 2 --
lib/namei.c | 2 --
lib/super.c | 2 --
lib/xattr.c | 2 --
lib/zmap.c | 2 --
man/Makefile.am | 1 -
mkfs/Makefile.am | 1 -
mkfs/main.c | 2 --
42 files changed, 78 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index b804aa9..9a49efc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,4 @@
# SPDX-License-Identifier: GPL-2.0+
-# Makefile.am
ACLOCAL_AMFLAGS = -I m4
diff --git a/fuse/Makefile.am b/fuse/Makefile.am
index e7757bc..962b467 100644
--- a/fuse/Makefile.am
+++ b/fuse/Makefile.am
@@ -1,5 +1,4 @@
# SPDX-License-Identifier: GPL-2.0+
-# Makefile.am
AUTOMAKE_OPTIONS = foreign
bin_PROGRAMS = erofsfuse
diff --git a/fuse/dir.c b/fuse/dir.c
index e16fda1..9d95ec6 100644
--- a/fuse/dir.c
+++ b/fuse/dir.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/fuse/dir.c
- *
* Created by Li Guifu <blucerlee@gmail.com>
*/
#include <fuse.h>
diff --git a/fuse/main.c b/fuse/main.c
index 5552480..34a9b7a 100644
--- a/fuse/main.c
+++ b/fuse/main.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/fuse/main.c
- *
* Created by Li Guifu <blucerlee@gmail.com>
*/
#include <stdlib.h>
diff --git a/include/erofs/block_list.h b/include/erofs/block_list.h
index 7756d8a..5127b23 100644
--- a/include/erofs/block_list.h
+++ b/include/erofs/block_list.h
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/include/erofs/block_list.h
- *
* Copyright (C), 2021, Coolpad Group Limited.
* Created by Yue Hu <huyue2@yulong.com>
*/
diff --git a/include/erofs/cache.h b/include/erofs/cache.h
index 611ca5b..a249d30 100644
--- a/include/erofs/cache.h
+++ b/include/erofs/cache.h
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
- * erofs-utils/include/erofs/cache.h
- *
* Copyright (C) 2018 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Miao Xie <miaoxie@huawei.com>
diff --git a/include/erofs/compress.h b/include/erofs/compress.h
index d234e8b..47fd489 100644
--- a/include/erofs/compress.h
+++ b/include/erofs/compress.h
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
- * erofs-utils/include/erofs/compress.h
- *
* Copyright (C) 2019 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Gao Xiang <gaoxiang25@huawei.com>
diff --git a/include/erofs/config.h b/include/erofs/config.h
index 8124f3b..896049b 100644
--- a/include/erofs/config.h
+++ b/include/erofs/config.h
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
- * erofs-utils/include/erofs/config.h
- *
* Copyright (C) 2018-2019 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Li Guifu <bluce.liguifu@huawei.com>
diff --git a/include/erofs/decompress.h b/include/erofs/decompress.h
index beaac35..0ba2b08 100644
--- a/include/erofs/decompress.h
+++ b/include/erofs/decompress.h
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
- * erofs-utils/include/erofs/decompress.h
- *
* Copyright (C), 2008-2020, OPPO Mobile Comm Corp., Ltd.
* Created by Huang Jianan <huangjianan@oppo.com>
*/
diff --git a/include/erofs/defs.h b/include/erofs/defs.h
index 5410685..6e0a777 100644
--- a/include/erofs/defs.h
+++ b/include/erofs/defs.h
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
- * erofs-utils/include/erofs/defs.h
- *
* Copyright (C) 2018 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Li Guifu <bluce.liguifu@huawei.com>
diff --git a/include/erofs/err.h b/include/erofs/err.h
index da3b681..2ff77a4 100644
--- a/include/erofs/err.h
+++ b/include/erofs/err.h
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
- * erofs-utils/include/erofs/err.h
- *
* Copyright (C) 2018 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Li Guifu <bluce.liguifu@huawei.com>
diff --git a/include/erofs/exclude.h b/include/erofs/exclude.h
index 88c55d7..98217e4 100644
--- a/include/erofs/exclude.h
+++ b/include/erofs/exclude.h
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
- * erofs-utils/include/erofs/exclude.h
- *
* Created by Li Guifu <bluce.lee@aliyun.com>
*/
#ifndef __EROFS_EXCLUDE_H
diff --git a/include/erofs/hashtable.h b/include/erofs/hashtable.h
index 7e47189..a71cb00 100644
--- a/include/erofs/hashtable.h
+++ b/include/erofs/hashtable.h
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */
/*
- * erofs-utils/include/erofs/hashtable.h
- *
* Original code taken from 'linux/include/linux/hash{,table}.h'
*/
#ifndef __EROFS_HASHTABLE_H
diff --git a/include/erofs/inode.h b/include/erofs/inode.h
index 5a7f5f1..a736762 100644
--- a/include/erofs/inode.h
+++ b/include/erofs/inode.h
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
- * erofs-utils/include/erofs/inode.h
- *
* Copyright (C) 2018-2019 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Li Guifu <bluce.liguifu@huawei.com>
diff --git a/include/erofs/internal.h b/include/erofs/internal.h
index 5583861..7dc5ff0 100644
--- a/include/erofs/internal.h
+++ b/include/erofs/internal.h
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
- * erofs-utils/include/erofs/internal.h
- *
* Copyright (C) 2019 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Gao Xiang <gaoxiang25@huawei.com>
diff --git a/include/erofs/io.h b/include/erofs/io.h
index 5574245..20b25d0 100644
--- a/include/erofs/io.h
+++ b/include/erofs/io.h
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
- * erofs-utils/include/erofs/io.h
- *
* Copyright (C) 2018-2019 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Li Guifu <bluce.liguifu@huawei.com>
diff --git a/include/erofs/list.h b/include/erofs/list.h
index 3572726..d2bc704 100644
--- a/include/erofs/list.h
+++ b/include/erofs/list.h
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
- * erofs-utils/include/erofs/list.h
- *
* Copyright (C) 2018 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Li Guifu <bluce.liguifu@huawei.com>
diff --git a/include/erofs/print.h b/include/erofs/print.h
index 6b79074..9c08a50 100644
--- a/include/erofs/print.h
+++ b/include/erofs/print.h
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
- * erofs-utils/include/erofs/print.h
- *
* Copyright (C) 2018-2019 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Li Guifu <bluce.liguifu@huawei.com>
diff --git a/include/erofs/trace.h b/include/erofs/trace.h
index 5a12da7..5412ded 100644
--- a/include/erofs/trace.h
+++ b/include/erofs/trace.h
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
- * erofs-utils/include/erofs/trace.h
- *
* Copyright (C) 2020 Gao Xiang <hsiangkao@aol.com>
*/
#ifndef __EROFS_TRACE_H
diff --git a/include/erofs/xattr.h b/include/erofs/xattr.h
index 197fe25..5086b54 100644
--- a/include/erofs/xattr.h
+++ b/include/erofs/xattr.h
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/include/erofs/xattr.h
- *
* Originally contributed by an anonymous person,
* heavily changed by Li Guifu <blucerlee@gmail.com>
* and Gao Xiang <xiang@kernel.org>
diff --git a/include/erofs_fs.h b/include/erofs_fs.h
index 18fc182..f9cdd71 100644
--- a/include/erofs_fs.h
+++ b/include/erofs_fs.h
@@ -1,6 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0-only OR Apache-2.0 */
/*
- * erofs-utils/include/erofs_fs.h
* EROFS (Enhanced ROM File System) on-disk format definition
*
* Copyright (C) 2017-2018 HUAWEI, Inc.
diff --git a/lib/Makefile.am b/lib/Makefile.am
index b12e2c1..87e6411 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,5 +1,4 @@
# SPDX-License-Identifier: GPL-2.0+
-# Makefile.am
noinst_LTLIBRARIES = liberofs.la
noinst_HEADERS = $(top_srcdir)/include/erofs_fs.h \
diff --git a/lib/block_list.c b/lib/block_list.c
index 3be0992..73c1bde 100644
--- a/lib/block_list.c
+++ b/lib/block_list.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/lib/block_list.c
- *
* Copyright (C), 2021, Coolpad Group Limited.
* Created by Yue Hu <huyue2@yulong.com>
*/
diff --git a/lib/cache.c b/lib/cache.c
index 340dcdd..0a1c0cf 100644
--- a/lib/cache.c
+++ b/lib/cache.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/lib/cache.c
- *
* Copyright (C) 2018-2019 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Miao Xie <miaoxie@huawei.com>
diff --git a/lib/compress.c b/lib/compress.c
index a8ebbc1..2b12d67 100644
--- a/lib/compress.c
+++ b/lib/compress.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/lib/compress.c
- *
* Copyright (C) 2018-2019 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Miao Xie <miaoxie@huawei.com>
diff --git a/lib/compressor.c b/lib/compressor.c
index 8836e0c..846a836 100644
--- a/lib/compressor.c
+++ b/lib/compressor.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/lib/compressor.c
- *
* Copyright (C) 2018-2019 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Gao Xiang <gaoxiang25@huawei.com>
diff --git a/lib/compressor.h b/lib/compressor.h
index b2471c4..132bd65 100644
--- a/lib/compressor.h
+++ b/lib/compressor.h
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
- * erofs-utils/lib/compressor.h
- *
* Copyright (C) 2018-2019 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Gao Xiang <gaoxiang25@huawei.com>
diff --git a/lib/compressor_lz4.c b/lib/compressor_lz4.c
index 292d0f2..ce8c472 100644
--- a/lib/compressor_lz4.c
+++ b/lib/compressor_lz4.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/lib/compressor-lz4.c
- *
* Copyright (C) 2018-2019 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Gao Xiang <gaoxiang25@huawei.com>
diff --git a/lib/compressor_lz4hc.c b/lib/compressor_lz4hc.c
index 14c3a71..e345f70 100644
--- a/lib/compressor_lz4hc.c
+++ b/lib/compressor_lz4hc.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/lib/compressor-lz4hc.c
- *
* Copyright (C) 2018-2019 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Gao Xiang <gaoxiang25@huawei.com>
diff --git a/lib/config.c b/lib/config.c
index 99fcf49..aa328c4 100644
--- a/lib/config.c
+++ b/lib/config.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/lib/config.c
- *
* Copyright (C) 2018-2019 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Li Guifu <bluce.liguifu@huawei.com>
diff --git a/lib/data.c b/lib/data.c
index 42b4904..32d4c00 100644
--- a/lib/data.c
+++ b/lib/data.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/lib/data.c
- *
* Copyright (C) 2020 Gao Xiang <hsiangkao@aol.com>
* Compression support by Huang Jianan <huangjianan@oppo.com>
*/
diff --git a/lib/decompress.c b/lib/decompress.c
index 490c4bc..2ee1439 100644
--- a/lib/decompress.c
+++ b/lib/decompress.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/lib/decompress.c
- *
* Copyright (C), 2008-2020, OPPO Mobile Comm Corp., Ltd.
* Created by Huang Jianan <huangjianan@oppo.com>
*/
diff --git a/lib/exclude.c b/lib/exclude.c
index 73b3720..e9e8b9b 100644
--- a/lib/exclude.c
+++ b/lib/exclude.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/lib/exclude.c
- *
* Created by Li Guifu <bluce.lee@aliyun.com>
*/
#include <string.h>
diff --git a/lib/inode.c b/lib/inode.c
index 6871d2b..62047d3 100644
--- a/lib/inode.c
+++ b/lib/inode.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/lib/inode.c
- *
* Copyright (C) 2018-2019 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Li Guifu <bluce.liguifu@huawei.com>
diff --git a/lib/io.c b/lib/io.c
index 6067041..b053137 100644
--- a/lib/io.c
+++ b/lib/io.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/lib/io.c
- *
* Copyright (C) 2018 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Li Guifu <bluce.liguifu@huawei.com>
diff --git a/lib/namei.c b/lib/namei.c
index b572d17..f4094a1 100644
--- a/lib/namei.c
+++ b/lib/namei.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/lib/namei.c
- *
* Created by Li Guifu <blucerlee@gmail.com>
*/
#include <sys/types.h>
diff --git a/lib/super.c b/lib/super.c
index 11405ec..c4a67f3 100644
--- a/lib/super.c
+++ b/lib/super.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/lib/super.c
- *
* Created by Li Guifu <blucerlee@gmail.com>
*/
#include <string.h>
diff --git a/lib/xattr.c b/lib/xattr.c
index aff3d67..39d4a96 100644
--- a/lib/xattr.c
+++ b/lib/xattr.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/lib/xattr.c
- *
* Originally contributed by an anonymous person,
* heavily changed by Li Guifu <blucerlee@gmail.com>
* and Gao Xiang <hsiangkao@aol.com>
diff --git a/lib/zmap.c b/lib/zmap.c
index 1084faa..fdc84af 100644
--- a/lib/zmap.c
+++ b/lib/zmap.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/lib/zmap.c
- *
* (a large amount of code was adapted from Linux kernel. )
*
* Copyright (C) 2018-2019 HUAWEI, Inc.
diff --git a/man/Makefile.am b/man/Makefile.am
index 0df947b..d62d6e2 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,5 +1,4 @@
# SPDX-License-Identifier: GPL-2.0+
-# Makefile.am
dist_man_MANS = mkfs.erofs.1
diff --git a/mkfs/Makefile.am b/mkfs/Makefile.am
index 8b8e051..bcef7e1 100644
--- a/mkfs/Makefile.am
+++ b/mkfs/Makefile.am
@@ -1,5 +1,4 @@
# SPDX-License-Identifier: GPL-2.0+
-# Makefile.am
AUTOMAKE_OPTIONS = foreign
bin_PROGRAMS = mkfs.erofs
diff --git a/mkfs/main.c b/mkfs/main.c
index 89f2310..debb754 100644
--- a/mkfs/main.c
+++ b/mkfs/main.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * mkfs/main.c
- *
* Copyright (C) 2018-2019 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Li Guifu <bluce.liguifu@huawei.com>
--
2.25.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 2/5] erofs-utils: fix SPDX comment style
2021-08-31 16:51 [PATCH 0/5] erofs-utils: fix checkpatch.pl complains Huang Jianan
2021-08-31 16:51 ` [PATCH 1/5] erofs-utils: remove filename in the file Huang Jianan
@ 2021-08-31 16:51 ` Huang Jianan
2021-09-03 3:10 ` Gao Xiang
2021-08-31 16:51 ` [PATCH 3/5] erofs-utils: fix general style problem Huang Jianan
` (3 subsequent siblings)
5 siblings, 1 reply; 21+ messages in thread
From: Huang Jianan @ 2021-08-31 16:51 UTC (permalink / raw)
To: linux-erofs
From: Huang Jianan <huangjianan@oppo.com>
Signed-off-by: Huang Jianan <huangjianan@oppo.com>
---
fuse/macosx.h | 1 +
include/erofs/block_list.h | 2 +-
include/erofs/xattr.h | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/fuse/macosx.h b/fuse/macosx.h
index 372eba6..81ac47f 100644
--- a/fuse/macosx.h
+++ b/fuse/macosx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
#ifdef __APPLE__
#undef LIST_HEAD
#endif
diff --git a/include/erofs/block_list.h b/include/erofs/block_list.h
index 5127b23..fca476a 100644
--- a/include/erofs/block_list.h
+++ b/include/erofs/block_list.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C), 2021, Coolpad Group Limited.
* Created by Yue Hu <huyue2@yulong.com>
diff --git a/include/erofs/xattr.h b/include/erofs/xattr.h
index 5086b54..f0c4c26 100644
--- a/include/erofs/xattr.h
+++ b/include/erofs/xattr.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Originally contributed by an anonymous person,
* heavily changed by Li Guifu <blucerlee@gmail.com>
--
2.25.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 3/5] erofs-utils: fix general style problem
2021-08-31 16:51 [PATCH 0/5] erofs-utils: fix checkpatch.pl complains Huang Jianan
2021-08-31 16:51 ` [PATCH 1/5] erofs-utils: remove filename in the file Huang Jianan
2021-08-31 16:51 ` [PATCH 2/5] erofs-utils: fix SPDX comment style Huang Jianan
@ 2021-08-31 16:51 ` Huang Jianan
2021-09-03 3:12 ` Gao Xiang
2021-08-31 16:51 ` [PATCH 4/5] erofs-utils: remove unnecessary codes and comments Huang Jianan
` (2 subsequent siblings)
5 siblings, 1 reply; 21+ messages in thread
From: Huang Jianan @ 2021-08-31 16:51 UTC (permalink / raw)
To: linux-erofs
From: Huang Jianan <huangjianan@oppo.com>
Signed-off-by: Huang Jianan <huangjianan@oppo.com>
---
fuse/main.c | 5 +----
include/erofs/block_list.h | 4 ++--
lib/block_list.c | 5 +----
lib/compress.c | 9 ++++-----
lib/compressor.c | 2 +-
lib/namei.c | 3 ++-
lib/xattr.c | 2 +-
mkfs/main.c | 2 +-
8 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/fuse/main.c b/fuse/main.c
index 34a9b7a..197943a 100644
--- a/fuse/main.c
+++ b/fuse/main.c
@@ -109,16 +109,13 @@ static struct options {
bool odebug;
} fusecfg;
-#define OPTION(t, p) \
- { t, offsetof(struct options, p), 1 }
+#define OPTION(t, p) { t, offsetof(struct options, p), 1 }
static const struct fuse_opt option_spec[] = {
OPTION("--dbglevel=%u", debug_lvl),
OPTION("--help", show_help),
FUSE_OPT_END
};
-#define OPTION(t, p) { t, offsetof(struct options, p), 1 }
-
static void usage(void)
{
struct fuse_args args = FUSE_ARGS_INIT(0, NULL);
diff --git a/include/erofs/block_list.h b/include/erofs/block_list.h
index fca476a..dcc0e50 100644
--- a/include/erofs/block_list.h
+++ b/include/erofs/block_list.h
@@ -18,8 +18,8 @@ void erofs_droid_blocklist_write_tail_end(struct erofs_inode *inode,
#else
static inline void erofs_droid_blocklist_write(struct erofs_inode *inode,
erofs_blk_t blk_start, erofs_blk_t nblocks) {}
-static inline
-void erofs_droid_blocklist_write_tail_end(struct erofs_inode *inode,
+static inline void
+erofs_droid_blocklist_write_tail_end(struct erofs_inode *inode,
erofs_blk_t blkaddr) {}
#endif
#endif
diff --git a/lib/block_list.c b/lib/block_list.c
index 73c1bde..15bb5cf 100644
--- a/lib/block_list.c
+++ b/lib/block_list.c
@@ -11,13 +11,10 @@
#define pr_fmt(fmt) "EROFS block_list: " FUNC_LINE_FMT fmt "\n"
#include "erofs/print.h"
-static FILE *block_list_fp = NULL;
+static FILE *block_list_fp;
int erofs_droid_blocklist_fopen(void)
{
- if (block_list_fp)
- return 0;
-
block_list_fp = fopen(cfg.block_list_file, "w");
if (!block_list_fp)
diff --git a/lib/compress.c b/lib/compress.c
index 2b12d67..0530765 100644
--- a/lib/compress.c
+++ b/lib/compress.c
@@ -292,13 +292,12 @@ static void *write_compacted_indexes(u8 *out,
bool update_blkaddr;
erofs_blk_t blkaddr;
- if (destsize == 4) {
+ if (destsize == 4)
vcnt = 2;
- } else if (destsize == 2 && logical_clusterbits == 12) {
+ else if (destsize == 2 && logical_clusterbits == 12)
vcnt = 16;
- } else {
+ else
return ERR_PTR(-EINVAL);
- }
encodebits = (vcnt * destsize * 8 - 32) / vcnt;
blkaddr = *blkaddr_ret;
update_blkaddr = erofs_sb_has_big_pcluster();
@@ -467,8 +466,8 @@ int erofs_write_compressed_file(struct erofs_inode *inode)
erofs_blk_t blkaddr, compressed_blocks;
unsigned int legacymetasize;
int ret, fd;
-
u8 *compressmeta = malloc(vle_compressmeta_capacity(inode->i_size));
+
if (!compressmeta)
return -ENOMEM;
diff --git a/lib/compressor.c b/lib/compressor.c
index 846a836..6bc5c4c 100644
--- a/lib/compressor.c
+++ b/lib/compressor.c
@@ -26,7 +26,7 @@ int erofs_compress_destsize(struct erofs_compress *c,
void *dst,
unsigned int dstsize)
{
- unsigned uncompressed_size;
+ unsigned int uncompressed_size;
int ret;
DBG_BUGON(!c->alg);
diff --git a/lib/namei.c b/lib/namei.c
index f4094a1..54c368a 100644
--- a/lib/namei.c
+++ b/lib/namei.c
@@ -243,7 +243,8 @@ static int link_path_walk(const char *name, struct nameidata *nd)
name = p;
/* Skip until no more slashes. */
- for (name = p; *name == '/'; ++name);
+ for (name = p; *name == '/'; ++name)
+ ;
}
return 0;
}
diff --git a/lib/xattr.c b/lib/xattr.c
index 39d4a96..821e6c9 100644
--- a/lib/xattr.c
+++ b/lib/xattr.c
@@ -215,7 +215,7 @@ static struct xattr_item *erofs_get_selabel_xattr(const char *srcpath,
erofs_fspath(srcpath));
else
#endif
- ret = asprintf(&fspath, "/%s", erofs_fspath(srcpath));
+ ret = asprintf(&fspath, "/%s", erofs_fspath(srcpath));
if (ret <= 0)
return ERR_PTR(-ENOMEM);
diff --git a/mkfs/main.c b/mkfs/main.c
index debb754..40ca94f 100644
--- a/mkfs/main.c
+++ b/mkfs/main.c
@@ -174,7 +174,7 @@ static int mkfs_parse_options_cfg(int argc, char *argv[])
char *endptr;
int opt, i;
- while((opt = getopt_long(argc, argv, "d:x:z:E:T:U:C:",
+ while ((opt = getopt_long(argc, argv, "d:x:z:E:T:U:C:",
long_options, NULL)) != -1) {
switch (opt) {
case 'z':
--
2.25.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 4/5] erofs-utils: remove unnecessary codes and comments
2021-08-31 16:51 [PATCH 0/5] erofs-utils: fix checkpatch.pl complains Huang Jianan
` (2 preceding siblings ...)
2021-08-31 16:51 ` [PATCH 3/5] erofs-utils: fix general style problem Huang Jianan
@ 2021-08-31 16:51 ` Huang Jianan
2021-09-03 3:17 ` Gao Xiang
2021-08-31 16:51 ` [PATCH 5/5] erofs-utils: fix print style Huang Jianan
2021-09-03 13:40 ` [PATCH V2 0/6] erofs-utils: fix checkpatch.pl complains Huang Jianan
5 siblings, 1 reply; 21+ messages in thread
From: Huang Jianan @ 2021-08-31 16:51 UTC (permalink / raw)
To: linux-erofs
From: Huang Jianan <huangjianan@oppo.com>
Signed-off-by: Huang Jianan <huangjianan@oppo.com>
---
lib/inode.c | 4 ----
lib/zmap.c | 1 -
2 files changed, 5 deletions(-)
diff --git a/lib/inode.c b/lib/inode.c
index 62047d3..f001016 100644
--- a/lib/inode.c
+++ b/lib/inode.c
@@ -677,11 +677,7 @@ out:
* Don't leave DATA buffers which were written in the global
* buffer list. It will make balloc() slowly.
*/
-#if 0
- bh->op = &erofs_drop_directly_bhops;
-#else
erofs_bdrop(bh, false);
-#endif
inode->bh_data = NULL;
}
return 0;
diff --git a/lib/zmap.c b/lib/zmap.c
index fdc84af..88da515 100644
--- a/lib/zmap.c
+++ b/lib/zmap.c
@@ -423,7 +423,6 @@ static int z_erofs_get_extent_compressedlen(struct z_erofs_maprecorder *m,
goto err_bonus_cblkcnt;
if (m->compressedlcs)
break;
- /* fallthrough */
default:
erofs_err("cannot found CBLKCNT @ lcn %lu of nid %llu",
lcn, vi->nid | 0ULL);
--
2.25.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 5/5] erofs-utils: fix print style
2021-08-31 16:51 [PATCH 0/5] erofs-utils: fix checkpatch.pl complains Huang Jianan
` (3 preceding siblings ...)
2021-08-31 16:51 ` [PATCH 4/5] erofs-utils: remove unnecessary codes and comments Huang Jianan
@ 2021-08-31 16:51 ` Huang Jianan
2021-09-03 3:18 ` Gao Xiang
2021-09-03 13:40 ` [PATCH V2 0/6] erofs-utils: fix checkpatch.pl complains Huang Jianan
5 siblings, 1 reply; 21+ messages in thread
From: Huang Jianan @ 2021-08-31 16:51 UTC (permalink / raw)
To: linux-erofs
From: Huang Jianan <huangjianan@oppo.com>
Fix warning "quoted string split across lines".
Signed-off-by: Huang Jianan <huangjianan@oppo.com>
---
lib/inode.c | 3 +--
lib/io.c | 3 +--
lib/zmap.c | 3 +--
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/lib/inode.c b/lib/inode.c
index f001016..76f5fb3 100644
--- a/lib/inode.c
+++ b/lib/inode.c
@@ -741,8 +741,7 @@ int erofs_droid_inode_fsconfig(struct erofs_inode *inode,
cfg.target_out_path,
&uid, &gid, &mode, &inode->capabilities);
- erofs_dbg("/%s -> mode = 0x%x, uid = 0x%x, gid = 0x%x, "
- "capabilities = 0x%" PRIx64 "\n",
+ erofs_dbg("/%s -> mode = 0x%x, uid = 0x%x, gid = 0x%x, capabilities = 0x%" PRIx64 "\n",
fspath, mode, uid, gid, inode->capabilities);
if (decorated)
diff --git a/lib/io.c b/lib/io.c
index b053137..620cb9c 100644
--- a/lib/io.c
+++ b/lib/io.c
@@ -242,8 +242,7 @@ int dev_read(void *buf, u64 offset, size_t len)
}
if (offset >= erofs_devsz || len > erofs_devsz ||
offset > erofs_devsz - len) {
- erofs_err("read posion[%" PRIu64 ", %zd] is too large beyond"
- "the end of device(%" PRIu64 ").",
+ erofs_err("read posion[%" PRIu64 ", %zd] is too large beyond the end of device(%" PRIu64 ").",
offset, len, erofs_devsz);
return -EINVAL;
}
diff --git a/lib/zmap.c b/lib/zmap.c
index 88da515..e4306ce 100644
--- a/lib/zmap.c
+++ b/lib/zmap.c
@@ -57,8 +57,7 @@ static int z_erofs_fill_inode_lazy(struct erofs_inode *vi)
if (vi->datalayout == EROFS_INODE_FLAT_COMPRESSION &&
!(vi->z_advise & Z_EROFS_ADVISE_BIG_PCLUSTER_1) ^
!(vi->z_advise & Z_EROFS_ADVISE_BIG_PCLUSTER_2)) {
- erofs_err(
-"big pcluster head1/2 of compact indexes should be consistent for nid %llu",
+ erofs_err("big pcluster head1/2 of compact indexes should be consistent for nid %llu",
vi->nid * 1ULL);
return -EFSCORRUPTED;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* Re: [PATCH 1/5] erofs-utils: remove filename in the file
2021-08-31 16:51 ` [PATCH 1/5] erofs-utils: remove filename in the file Huang Jianan
@ 2021-09-03 3:09 ` Gao Xiang
0 siblings, 0 replies; 21+ messages in thread
From: Gao Xiang @ 2021-09-03 3:09 UTC (permalink / raw)
To: Huang Jianan; +Cc: linux-erofs
On Wed, Sep 01, 2021 at 12:51:12AM +0800, Huang Jianan wrote:
> From: Huang Jianan <huangjianan@oppo.com>
>
> It's generally not useful to have the filename in the file.
>
> Signed-off-by: Huang Jianan <huangjianan@oppo.com>
If we decide to clean up this stuff, could we remove trailing newline
like the commit below?
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/fs/erofs?id=c5fcb51111b85323cafe3f02784f7f0bf6a7cf07
Thanks,
Gao Xiang
> ---
> Makefile.am | 1 -
> fuse/Makefile.am | 1 -
> fuse/dir.c | 2 --
> fuse/main.c | 2 --
> include/erofs/block_list.h | 2 --
> include/erofs/cache.h | 2 --
> include/erofs/compress.h | 2 --
> include/erofs/config.h | 2 --
> include/erofs/decompress.h | 2 --
> include/erofs/defs.h | 2 --
> include/erofs/err.h | 2 --
> include/erofs/exclude.h | 2 --
> include/erofs/hashtable.h | 2 --
> include/erofs/inode.h | 2 --
> include/erofs/internal.h | 2 --
> include/erofs/io.h | 2 --
> include/erofs/list.h | 2 --
> include/erofs/print.h | 2 --
> include/erofs/trace.h | 2 --
> include/erofs/xattr.h | 2 --
> include/erofs_fs.h | 1 -
> lib/Makefile.am | 1 -
> lib/block_list.c | 2 --
> lib/cache.c | 2 --
> lib/compress.c | 2 --
> lib/compressor.c | 2 --
> lib/compressor.h | 2 --
> lib/compressor_lz4.c | 2 --
> lib/compressor_lz4hc.c | 2 --
> lib/config.c | 2 --
> lib/data.c | 2 --
> lib/decompress.c | 2 --
> lib/exclude.c | 2 --
> lib/inode.c | 2 --
> lib/io.c | 2 --
> lib/namei.c | 2 --
> lib/super.c | 2 --
> lib/xattr.c | 2 --
> lib/zmap.c | 2 --
> man/Makefile.am | 1 -
> mkfs/Makefile.am | 1 -
> mkfs/main.c | 2 --
> 42 files changed, 78 deletions(-)
>
> diff --git a/Makefile.am b/Makefile.am
> index b804aa9..9a49efc 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -1,5 +1,4 @@
> # SPDX-License-Identifier: GPL-2.0+
> -# Makefile.am
>
> ACLOCAL_AMFLAGS = -I m4
>
> diff --git a/fuse/Makefile.am b/fuse/Makefile.am
> index e7757bc..962b467 100644
> --- a/fuse/Makefile.am
> +++ b/fuse/Makefile.am
> @@ -1,5 +1,4 @@
> # SPDX-License-Identifier: GPL-2.0+
> -# Makefile.am
>
> AUTOMAKE_OPTIONS = foreign
> bin_PROGRAMS = erofsfuse
> diff --git a/fuse/dir.c b/fuse/dir.c
> index e16fda1..9d95ec6 100644
> --- a/fuse/dir.c
> +++ b/fuse/dir.c
> @@ -1,7 +1,5 @@
> // SPDX-License-Identifier: GPL-2.0+
> /*
> - * erofs-utils/fuse/dir.c
> - *
> * Created by Li Guifu <blucerlee@gmail.com>
> */
> #include <fuse.h>
> diff --git a/fuse/main.c b/fuse/main.c
> index 5552480..34a9b7a 100644
> --- a/fuse/main.c
> +++ b/fuse/main.c
> @@ -1,7 +1,5 @@
> // SPDX-License-Identifier: GPL-2.0+
> /*
> - * erofs-utils/fuse/main.c
> - *
> * Created by Li Guifu <blucerlee@gmail.com>
> */
> #include <stdlib.h>
> diff --git a/include/erofs/block_list.h b/include/erofs/block_list.h
> index 7756d8a..5127b23 100644
> --- a/include/erofs/block_list.h
> +++ b/include/erofs/block_list.h
> @@ -1,7 +1,5 @@
> // SPDX-License-Identifier: GPL-2.0+
> /*
> - * erofs-utils/include/erofs/block_list.h
> - *
> * Copyright (C), 2021, Coolpad Group Limited.
> * Created by Yue Hu <huyue2@yulong.com>
> */
> diff --git a/include/erofs/cache.h b/include/erofs/cache.h
> index 611ca5b..a249d30 100644
> --- a/include/erofs/cache.h
> +++ b/include/erofs/cache.h
> @@ -1,7 +1,5 @@
> /* SPDX-License-Identifier: GPL-2.0+ */
> /*
> - * erofs-utils/include/erofs/cache.h
> - *
> * Copyright (C) 2018 HUAWEI, Inc.
> * http://www.huawei.com/
> * Created by Miao Xie <miaoxie@huawei.com>
> diff --git a/include/erofs/compress.h b/include/erofs/compress.h
> index d234e8b..47fd489 100644
> --- a/include/erofs/compress.h
> +++ b/include/erofs/compress.h
> @@ -1,7 +1,5 @@
> /* SPDX-License-Identifier: GPL-2.0+ */
> /*
> - * erofs-utils/include/erofs/compress.h
> - *
> * Copyright (C) 2019 HUAWEI, Inc.
> * http://www.huawei.com/
> * Created by Gao Xiang <gaoxiang25@huawei.com>
> diff --git a/include/erofs/config.h b/include/erofs/config.h
> index 8124f3b..896049b 100644
> --- a/include/erofs/config.h
> +++ b/include/erofs/config.h
> @@ -1,7 +1,5 @@
> /* SPDX-License-Identifier: GPL-2.0+ */
> /*
> - * erofs-utils/include/erofs/config.h
> - *
> * Copyright (C) 2018-2019 HUAWEI, Inc.
> * http://www.huawei.com/
> * Created by Li Guifu <bluce.liguifu@huawei.com>
> diff --git a/include/erofs/decompress.h b/include/erofs/decompress.h
> index beaac35..0ba2b08 100644
> --- a/include/erofs/decompress.h
> +++ b/include/erofs/decompress.h
> @@ -1,7 +1,5 @@
> /* SPDX-License-Identifier: GPL-2.0+ */
> /*
> - * erofs-utils/include/erofs/decompress.h
> - *
> * Copyright (C), 2008-2020, OPPO Mobile Comm Corp., Ltd.
> * Created by Huang Jianan <huangjianan@oppo.com>
> */
> diff --git a/include/erofs/defs.h b/include/erofs/defs.h
> index 5410685..6e0a777 100644
> --- a/include/erofs/defs.h
> +++ b/include/erofs/defs.h
> @@ -1,7 +1,5 @@
> /* SPDX-License-Identifier: GPL-2.0+ */
> /*
> - * erofs-utils/include/erofs/defs.h
> - *
> * Copyright (C) 2018 HUAWEI, Inc.
> * http://www.huawei.com/
> * Created by Li Guifu <bluce.liguifu@huawei.com>
> diff --git a/include/erofs/err.h b/include/erofs/err.h
> index da3b681..2ff77a4 100644
> --- a/include/erofs/err.h
> +++ b/include/erofs/err.h
> @@ -1,7 +1,5 @@
> /* SPDX-License-Identifier: GPL-2.0+ */
> /*
> - * erofs-utils/include/erofs/err.h
> - *
> * Copyright (C) 2018 HUAWEI, Inc.
> * http://www.huawei.com/
> * Created by Li Guifu <bluce.liguifu@huawei.com>
> diff --git a/include/erofs/exclude.h b/include/erofs/exclude.h
> index 88c55d7..98217e4 100644
> --- a/include/erofs/exclude.h
> +++ b/include/erofs/exclude.h
> @@ -1,7 +1,5 @@
> /* SPDX-License-Identifier: GPL-2.0+ */
> /*
> - * erofs-utils/include/erofs/exclude.h
> - *
> * Created by Li Guifu <bluce.lee@aliyun.com>
> */
> #ifndef __EROFS_EXCLUDE_H
> diff --git a/include/erofs/hashtable.h b/include/erofs/hashtable.h
> index 7e47189..a71cb00 100644
> --- a/include/erofs/hashtable.h
> +++ b/include/erofs/hashtable.h
> @@ -1,7 +1,5 @@
> /* SPDX-License-Identifier: GPL-2.0 */
> /*
> - * erofs-utils/include/erofs/hashtable.h
> - *
> * Original code taken from 'linux/include/linux/hash{,table}.h'
> */
> #ifndef __EROFS_HASHTABLE_H
> diff --git a/include/erofs/inode.h b/include/erofs/inode.h
> index 5a7f5f1..a736762 100644
> --- a/include/erofs/inode.h
> +++ b/include/erofs/inode.h
> @@ -1,7 +1,5 @@
> /* SPDX-License-Identifier: GPL-2.0+ */
> /*
> - * erofs-utils/include/erofs/inode.h
> - *
> * Copyright (C) 2018-2019 HUAWEI, Inc.
> * http://www.huawei.com/
> * Created by Li Guifu <bluce.liguifu@huawei.com>
> diff --git a/include/erofs/internal.h b/include/erofs/internal.h
> index 5583861..7dc5ff0 100644
> --- a/include/erofs/internal.h
> +++ b/include/erofs/internal.h
> @@ -1,7 +1,5 @@
> /* SPDX-License-Identifier: GPL-2.0+ */
> /*
> - * erofs-utils/include/erofs/internal.h
> - *
> * Copyright (C) 2019 HUAWEI, Inc.
> * http://www.huawei.com/
> * Created by Gao Xiang <gaoxiang25@huawei.com>
> diff --git a/include/erofs/io.h b/include/erofs/io.h
> index 5574245..20b25d0 100644
> --- a/include/erofs/io.h
> +++ b/include/erofs/io.h
> @@ -1,7 +1,5 @@
> /* SPDX-License-Identifier: GPL-2.0+ */
> /*
> - * erofs-utils/include/erofs/io.h
> - *
> * Copyright (C) 2018-2019 HUAWEI, Inc.
> * http://www.huawei.com/
> * Created by Li Guifu <bluce.liguifu@huawei.com>
> diff --git a/include/erofs/list.h b/include/erofs/list.h
> index 3572726..d2bc704 100644
> --- a/include/erofs/list.h
> +++ b/include/erofs/list.h
> @@ -1,7 +1,5 @@
> /* SPDX-License-Identifier: GPL-2.0+ */
> /*
> - * erofs-utils/include/erofs/list.h
> - *
> * Copyright (C) 2018 HUAWEI, Inc.
> * http://www.huawei.com/
> * Created by Li Guifu <bluce.liguifu@huawei.com>
> diff --git a/include/erofs/print.h b/include/erofs/print.h
> index 6b79074..9c08a50 100644
> --- a/include/erofs/print.h
> +++ b/include/erofs/print.h
> @@ -1,7 +1,5 @@
> /* SPDX-License-Identifier: GPL-2.0+ */
> /*
> - * erofs-utils/include/erofs/print.h
> - *
> * Copyright (C) 2018-2019 HUAWEI, Inc.
> * http://www.huawei.com/
> * Created by Li Guifu <bluce.liguifu@huawei.com>
> diff --git a/include/erofs/trace.h b/include/erofs/trace.h
> index 5a12da7..5412ded 100644
> --- a/include/erofs/trace.h
> +++ b/include/erofs/trace.h
> @@ -1,7 +1,5 @@
> /* SPDX-License-Identifier: GPL-2.0+ */
> /*
> - * erofs-utils/include/erofs/trace.h
> - *
> * Copyright (C) 2020 Gao Xiang <hsiangkao@aol.com>
> */
> #ifndef __EROFS_TRACE_H
> diff --git a/include/erofs/xattr.h b/include/erofs/xattr.h
> index 197fe25..5086b54 100644
> --- a/include/erofs/xattr.h
> +++ b/include/erofs/xattr.h
> @@ -1,7 +1,5 @@
> // SPDX-License-Identifier: GPL-2.0+
> /*
> - * erofs-utils/include/erofs/xattr.h
> - *
> * Originally contributed by an anonymous person,
> * heavily changed by Li Guifu <blucerlee@gmail.com>
> * and Gao Xiang <xiang@kernel.org>
> diff --git a/include/erofs_fs.h b/include/erofs_fs.h
> index 18fc182..f9cdd71 100644
> --- a/include/erofs_fs.h
> +++ b/include/erofs_fs.h
> @@ -1,6 +1,5 @@
> /* SPDX-License-Identifier: GPL-2.0-only OR Apache-2.0 */
> /*
> - * erofs-utils/include/erofs_fs.h
> * EROFS (Enhanced ROM File System) on-disk format definition
> *
> * Copyright (C) 2017-2018 HUAWEI, Inc.
> diff --git a/lib/Makefile.am b/lib/Makefile.am
> index b12e2c1..87e6411 100644
> --- a/lib/Makefile.am
> +++ b/lib/Makefile.am
> @@ -1,5 +1,4 @@
> # SPDX-License-Identifier: GPL-2.0+
> -# Makefile.am
>
> noinst_LTLIBRARIES = liberofs.la
> noinst_HEADERS = $(top_srcdir)/include/erofs_fs.h \
> diff --git a/lib/block_list.c b/lib/block_list.c
> index 3be0992..73c1bde 100644
> --- a/lib/block_list.c
> +++ b/lib/block_list.c
> @@ -1,7 +1,5 @@
> // SPDX-License-Identifier: GPL-2.0+
> /*
> - * erofs-utils/lib/block_list.c
> - *
> * Copyright (C), 2021, Coolpad Group Limited.
> * Created by Yue Hu <huyue2@yulong.com>
> */
> diff --git a/lib/cache.c b/lib/cache.c
> index 340dcdd..0a1c0cf 100644
> --- a/lib/cache.c
> +++ b/lib/cache.c
> @@ -1,7 +1,5 @@
> // SPDX-License-Identifier: GPL-2.0+
> /*
> - * erofs-utils/lib/cache.c
> - *
> * Copyright (C) 2018-2019 HUAWEI, Inc.
> * http://www.huawei.com/
> * Created by Miao Xie <miaoxie@huawei.com>
> diff --git a/lib/compress.c b/lib/compress.c
> index a8ebbc1..2b12d67 100644
> --- a/lib/compress.c
> +++ b/lib/compress.c
> @@ -1,7 +1,5 @@
> // SPDX-License-Identifier: GPL-2.0+
> /*
> - * erofs-utils/lib/compress.c
> - *
> * Copyright (C) 2018-2019 HUAWEI, Inc.
> * http://www.huawei.com/
> * Created by Miao Xie <miaoxie@huawei.com>
> diff --git a/lib/compressor.c b/lib/compressor.c
> index 8836e0c..846a836 100644
> --- a/lib/compressor.c
> +++ b/lib/compressor.c
> @@ -1,7 +1,5 @@
> // SPDX-License-Identifier: GPL-2.0+
> /*
> - * erofs-utils/lib/compressor.c
> - *
> * Copyright (C) 2018-2019 HUAWEI, Inc.
> * http://www.huawei.com/
> * Created by Gao Xiang <gaoxiang25@huawei.com>
> diff --git a/lib/compressor.h b/lib/compressor.h
> index b2471c4..132bd65 100644
> --- a/lib/compressor.h
> +++ b/lib/compressor.h
> @@ -1,7 +1,5 @@
> /* SPDX-License-Identifier: GPL-2.0+ */
> /*
> - * erofs-utils/lib/compressor.h
> - *
> * Copyright (C) 2018-2019 HUAWEI, Inc.
> * http://www.huawei.com/
> * Created by Gao Xiang <gaoxiang25@huawei.com>
> diff --git a/lib/compressor_lz4.c b/lib/compressor_lz4.c
> index 292d0f2..ce8c472 100644
> --- a/lib/compressor_lz4.c
> +++ b/lib/compressor_lz4.c
> @@ -1,7 +1,5 @@
> // SPDX-License-Identifier: GPL-2.0+
> /*
> - * erofs-utils/lib/compressor-lz4.c
> - *
> * Copyright (C) 2018-2019 HUAWEI, Inc.
> * http://www.huawei.com/
> * Created by Gao Xiang <gaoxiang25@huawei.com>
> diff --git a/lib/compressor_lz4hc.c b/lib/compressor_lz4hc.c
> index 14c3a71..e345f70 100644
> --- a/lib/compressor_lz4hc.c
> +++ b/lib/compressor_lz4hc.c
> @@ -1,7 +1,5 @@
> // SPDX-License-Identifier: GPL-2.0+
> /*
> - * erofs-utils/lib/compressor-lz4hc.c
> - *
> * Copyright (C) 2018-2019 HUAWEI, Inc.
> * http://www.huawei.com/
> * Created by Gao Xiang <gaoxiang25@huawei.com>
> diff --git a/lib/config.c b/lib/config.c
> index 99fcf49..aa328c4 100644
> --- a/lib/config.c
> +++ b/lib/config.c
> @@ -1,7 +1,5 @@
> // SPDX-License-Identifier: GPL-2.0+
> /*
> - * erofs-utils/lib/config.c
> - *
> * Copyright (C) 2018-2019 HUAWEI, Inc.
> * http://www.huawei.com/
> * Created by Li Guifu <bluce.liguifu@huawei.com>
> diff --git a/lib/data.c b/lib/data.c
> index 42b4904..32d4c00 100644
> --- a/lib/data.c
> +++ b/lib/data.c
> @@ -1,7 +1,5 @@
> // SPDX-License-Identifier: GPL-2.0+
> /*
> - * erofs-utils/lib/data.c
> - *
> * Copyright (C) 2020 Gao Xiang <hsiangkao@aol.com>
> * Compression support by Huang Jianan <huangjianan@oppo.com>
> */
> diff --git a/lib/decompress.c b/lib/decompress.c
> index 490c4bc..2ee1439 100644
> --- a/lib/decompress.c
> +++ b/lib/decompress.c
> @@ -1,7 +1,5 @@
> // SPDX-License-Identifier: GPL-2.0+
> /*
> - * erofs-utils/lib/decompress.c
> - *
> * Copyright (C), 2008-2020, OPPO Mobile Comm Corp., Ltd.
> * Created by Huang Jianan <huangjianan@oppo.com>
> */
> diff --git a/lib/exclude.c b/lib/exclude.c
> index 73b3720..e9e8b9b 100644
> --- a/lib/exclude.c
> +++ b/lib/exclude.c
> @@ -1,7 +1,5 @@
> // SPDX-License-Identifier: GPL-2.0+
> /*
> - * erofs-utils/lib/exclude.c
> - *
> * Created by Li Guifu <bluce.lee@aliyun.com>
> */
> #include <string.h>
> diff --git a/lib/inode.c b/lib/inode.c
> index 6871d2b..62047d3 100644
> --- a/lib/inode.c
> +++ b/lib/inode.c
> @@ -1,7 +1,5 @@
> // SPDX-License-Identifier: GPL-2.0+
> /*
> - * erofs-utils/lib/inode.c
> - *
> * Copyright (C) 2018-2019 HUAWEI, Inc.
> * http://www.huawei.com/
> * Created by Li Guifu <bluce.liguifu@huawei.com>
> diff --git a/lib/io.c b/lib/io.c
> index 6067041..b053137 100644
> --- a/lib/io.c
> +++ b/lib/io.c
> @@ -1,7 +1,5 @@
> // SPDX-License-Identifier: GPL-2.0+
> /*
> - * erofs-utils/lib/io.c
> - *
> * Copyright (C) 2018 HUAWEI, Inc.
> * http://www.huawei.com/
> * Created by Li Guifu <bluce.liguifu@huawei.com>
> diff --git a/lib/namei.c b/lib/namei.c
> index b572d17..f4094a1 100644
> --- a/lib/namei.c
> +++ b/lib/namei.c
> @@ -1,7 +1,5 @@
> // SPDX-License-Identifier: GPL-2.0+
> /*
> - * erofs-utils/lib/namei.c
> - *
> * Created by Li Guifu <blucerlee@gmail.com>
> */
> #include <sys/types.h>
> diff --git a/lib/super.c b/lib/super.c
> index 11405ec..c4a67f3 100644
> --- a/lib/super.c
> +++ b/lib/super.c
> @@ -1,7 +1,5 @@
> // SPDX-License-Identifier: GPL-2.0+
> /*
> - * erofs-utils/lib/super.c
> - *
> * Created by Li Guifu <blucerlee@gmail.com>
> */
> #include <string.h>
> diff --git a/lib/xattr.c b/lib/xattr.c
> index aff3d67..39d4a96 100644
> --- a/lib/xattr.c
> +++ b/lib/xattr.c
> @@ -1,7 +1,5 @@
> // SPDX-License-Identifier: GPL-2.0+
> /*
> - * erofs-utils/lib/xattr.c
> - *
> * Originally contributed by an anonymous person,
> * heavily changed by Li Guifu <blucerlee@gmail.com>
> * and Gao Xiang <hsiangkao@aol.com>
> diff --git a/lib/zmap.c b/lib/zmap.c
> index 1084faa..fdc84af 100644
> --- a/lib/zmap.c
> +++ b/lib/zmap.c
> @@ -1,7 +1,5 @@
> // SPDX-License-Identifier: GPL-2.0+
> /*
> - * erofs-utils/lib/zmap.c
> - *
> * (a large amount of code was adapted from Linux kernel. )
> *
> * Copyright (C) 2018-2019 HUAWEI, Inc.
> diff --git a/man/Makefile.am b/man/Makefile.am
> index 0df947b..d62d6e2 100644
> --- a/man/Makefile.am
> +++ b/man/Makefile.am
> @@ -1,5 +1,4 @@
> # SPDX-License-Identifier: GPL-2.0+
> -# Makefile.am
>
> dist_man_MANS = mkfs.erofs.1
>
> diff --git a/mkfs/Makefile.am b/mkfs/Makefile.am
> index 8b8e051..bcef7e1 100644
> --- a/mkfs/Makefile.am
> +++ b/mkfs/Makefile.am
> @@ -1,5 +1,4 @@
> # SPDX-License-Identifier: GPL-2.0+
> -# Makefile.am
>
> AUTOMAKE_OPTIONS = foreign
> bin_PROGRAMS = mkfs.erofs
> diff --git a/mkfs/main.c b/mkfs/main.c
> index 89f2310..debb754 100644
> --- a/mkfs/main.c
> +++ b/mkfs/main.c
> @@ -1,7 +1,5 @@
> // SPDX-License-Identifier: GPL-2.0+
> /*
> - * mkfs/main.c
> - *
> * Copyright (C) 2018-2019 HUAWEI, Inc.
> * http://www.huawei.com/
> * Created by Li Guifu <bluce.liguifu@huawei.com>
> --
> 2.25.1
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 2/5] erofs-utils: fix SPDX comment style
2021-08-31 16:51 ` [PATCH 2/5] erofs-utils: fix SPDX comment style Huang Jianan
@ 2021-09-03 3:10 ` Gao Xiang
0 siblings, 0 replies; 21+ messages in thread
From: Gao Xiang @ 2021-09-03 3:10 UTC (permalink / raw)
To: Huang Jianan; +Cc: linux-erofs
On Wed, Sep 01, 2021 at 12:51:13AM +0800, Huang Jianan wrote:
> From: Huang Jianan <huangjianan@oppo.com>
>
> Signed-off-by: Huang Jianan <huangjianan@oppo.com>
Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Thanks,
Gao Xiang
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 3/5] erofs-utils: fix general style problem
2021-08-31 16:51 ` [PATCH 3/5] erofs-utils: fix general style problem Huang Jianan
@ 2021-09-03 3:12 ` Gao Xiang
0 siblings, 0 replies; 21+ messages in thread
From: Gao Xiang @ 2021-09-03 3:12 UTC (permalink / raw)
To: Huang Jianan; +Cc: linux-erofs
On Wed, Sep 01, 2021 at 12:51:14AM +0800, Huang Jianan wrote:
> From: Huang Jianan <huangjianan@oppo.com>
>
> Signed-off-by: Huang Jianan <huangjianan@oppo.com>
Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Thanks,
Gao Xiang
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 4/5] erofs-utils: remove unnecessary codes and comments
2021-08-31 16:51 ` [PATCH 4/5] erofs-utils: remove unnecessary codes and comments Huang Jianan
@ 2021-09-03 3:17 ` Gao Xiang
0 siblings, 0 replies; 21+ messages in thread
From: Gao Xiang @ 2021-09-03 3:17 UTC (permalink / raw)
To: Huang Jianan; +Cc: linux-erofs
On Wed, Sep 01, 2021 at 12:51:15AM +0800, Huang Jianan wrote:
> From: Huang Jianan <huangjianan@oppo.com>
>
> Signed-off-by: Huang Jianan <huangjianan@oppo.com>
> ---
> lib/inode.c | 4 ----
> lib/zmap.c | 1 -
> 2 files changed, 5 deletions(-)
>
> diff --git a/lib/inode.c b/lib/inode.c
> index 62047d3..f001016 100644
> --- a/lib/inode.c
> +++ b/lib/inode.c
> @@ -677,11 +677,7 @@ out:
> * Don't leave DATA buffers which were written in the global
> * buffer list. It will make balloc() slowly.
> */
> -#if 0
> - bh->op = &erofs_drop_directly_bhops;
> -#else
> erofs_bdrop(bh, false);
> -#endif
> inode->bh_data = NULL;
> }
> return 0;
> diff --git a/lib/zmap.c b/lib/zmap.c
> index fdc84af..88da515 100644
> --- a/lib/zmap.c
> +++ b/lib/zmap.c
> @@ -423,7 +423,6 @@ static int z_erofs_get_extent_compressedlen(struct z_erofs_maprecorder *m,
> goto err_bonus_cblkcnt;
> if (m->compressedlcs)
> break;
> - /* fallthrough */
I don't think this should be removed. On the kernel side, we use
"fallthrough;" instead.
Could we add all the missing "/* fallthrough */"?
Thanks,
Gao Xiang
> default:
> erofs_err("cannot found CBLKCNT @ lcn %lu of nid %llu",
> lcn, vi->nid | 0ULL);
> --
> 2.25.1
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 5/5] erofs-utils: fix print style
2021-08-31 16:51 ` [PATCH 5/5] erofs-utils: fix print style Huang Jianan
@ 2021-09-03 3:18 ` Gao Xiang
0 siblings, 0 replies; 21+ messages in thread
From: Gao Xiang @ 2021-09-03 3:18 UTC (permalink / raw)
To: Huang Jianan; +Cc: linux-erofs
On Wed, Sep 01, 2021 at 12:51:16AM +0800, Huang Jianan wrote:
> From: Huang Jianan <huangjianan@oppo.com>
>
> Fix warning "quoted string split across lines".
>
> Signed-off-by: Huang Jianan <huangjianan@oppo.com>
Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Thanks,
Gao Xiang
> ---
> lib/inode.c | 3 +--
> lib/io.c | 3 +--
> lib/zmap.c | 3 +--
> 3 files changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/lib/inode.c b/lib/inode.c
> index f001016..76f5fb3 100644
> --- a/lib/inode.c
> +++ b/lib/inode.c
> @@ -741,8 +741,7 @@ int erofs_droid_inode_fsconfig(struct erofs_inode *inode,
> cfg.target_out_path,
> &uid, &gid, &mode, &inode->capabilities);
>
> - erofs_dbg("/%s -> mode = 0x%x, uid = 0x%x, gid = 0x%x, "
> - "capabilities = 0x%" PRIx64 "\n",
> + erofs_dbg("/%s -> mode = 0x%x, uid = 0x%x, gid = 0x%x, capabilities = 0x%" PRIx64 "\n",
> fspath, mode, uid, gid, inode->capabilities);
>
> if (decorated)
> diff --git a/lib/io.c b/lib/io.c
> index b053137..620cb9c 100644
> --- a/lib/io.c
> +++ b/lib/io.c
> @@ -242,8 +242,7 @@ int dev_read(void *buf, u64 offset, size_t len)
> }
> if (offset >= erofs_devsz || len > erofs_devsz ||
> offset > erofs_devsz - len) {
> - erofs_err("read posion[%" PRIu64 ", %zd] is too large beyond"
> - "the end of device(%" PRIu64 ").",
> + erofs_err("read posion[%" PRIu64 ", %zd] is too large beyond the end of device(%" PRIu64 ").",
> offset, len, erofs_devsz);
> return -EINVAL;
> }
> diff --git a/lib/zmap.c b/lib/zmap.c
> index 88da515..e4306ce 100644
> --- a/lib/zmap.c
> +++ b/lib/zmap.c
> @@ -57,8 +57,7 @@ static int z_erofs_fill_inode_lazy(struct erofs_inode *vi)
> if (vi->datalayout == EROFS_INODE_FLAT_COMPRESSION &&
> !(vi->z_advise & Z_EROFS_ADVISE_BIG_PCLUSTER_1) ^
> !(vi->z_advise & Z_EROFS_ADVISE_BIG_PCLUSTER_2)) {
> - erofs_err(
> -"big pcluster head1/2 of compact indexes should be consistent for nid %llu",
> + erofs_err("big pcluster head1/2 of compact indexes should be consistent for nid %llu",
> vi->nid * 1ULL);
> return -EFSCORRUPTED;
> }
> --
> 2.25.1
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH V2 0/6] erofs-utils: fix checkpatch.pl complains
2021-08-31 16:51 [PATCH 0/5] erofs-utils: fix checkpatch.pl complains Huang Jianan
` (4 preceding siblings ...)
2021-08-31 16:51 ` [PATCH 5/5] erofs-utils: fix print style Huang Jianan
@ 2021-09-03 13:40 ` Huang Jianan
2021-09-03 13:40 ` [PATCH V2 1/6] erofs-utils: clean up file headers & footers Huang Jianan
` (5 more replies)
5 siblings, 6 replies; 21+ messages in thread
From: Huang Jianan @ 2021-09-03 13:40 UTC (permalink / raw)
To: linux-erofs
From: Huang Jianan <huangjianan@oppo.com>
This patchset fix most of checkpatch.pl complains in erofs-utils, some
problems that also exist in the kernel haven't been fixed.
Changes since v1:
- remove trailing newline (Gao Xiang);
- add missing /* fallthrough */ (Gao Xiang);
Huang Jianan (6):
erofs-utils: clean up file headers & footers
erofs-utils: fix SPDX comment style
erofs-utils: fix general style problem
erofs-utils: remove unnecessary codes
erofs-utils: fix print style
erofs-utils: add missing /* fallthrough */
AUTHORS | 1 -
ChangeLog | 1 -
Makefile.am | 2 --
README | 1 -
autogen.sh | 1 -
configure.ac | 1 -
fuse/Makefile.am | 2 --
fuse/dir.c | 3 ---
fuse/macosx.h | 1 +
fuse/main.c | 8 +-------
include/erofs/block_list.h | 8 +++-----
include/erofs/cache.h | 3 ---
include/erofs/compress.h | 3 ---
include/erofs/config.h | 3 ---
include/erofs/decompress.h | 2 --
include/erofs/defs.h | 2 --
include/erofs/err.h | 3 ---
include/erofs/exclude.h | 3 ---
include/erofs/hashtable.h | 2 --
include/erofs/inode.h | 2 --
include/erofs/internal.h | 2 --
include/erofs/io.h | 3 ---
include/erofs/list.h | 2 --
include/erofs/print.h | 4 ----
include/erofs/trace.h | 3 ---
include/erofs/xattr.h | 4 +---
include/erofs_fs.h | 2 --
lib/Makefile.am | 2 --
lib/block_list.c | 7 +------
lib/cache.c | 3 ---
lib/compress.c | 12 ++++--------
lib/compressor.c | 5 +----
lib/compressor.h | 3 ---
lib/compressor_lz4.c | 3 ---
lib/compressor_lz4hc.c | 3 ---
lib/config.c | 3 ---
lib/data.c | 3 ---
lib/decompress.c | 2 --
lib/exclude.c | 3 ---
lib/inode.c | 10 +---------
lib/io.c | 5 +----
lib/namei.c | 6 ++----
lib/super.c | 3 ---
lib/xattr.c | 5 +----
lib/zmap.c | 8 ++++----
man/Makefile.am | 1 -
man/mkfs.erofs.1 | 1 -
mkfs/Makefile.am | 2 --
mkfs/main.c | 4 +---
49 files changed, 22 insertions(+), 144 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH V2 1/6] erofs-utils: clean up file headers & footers
2021-09-03 13:40 ` [PATCH V2 0/6] erofs-utils: fix checkpatch.pl complains Huang Jianan
@ 2021-09-03 13:40 ` Huang Jianan
2021-09-03 15:03 ` Gao Xiang
2021-09-03 13:40 ` [PATCH V2 2/6] erofs-utils: fix SPDX comment style Huang Jianan
` (4 subsequent siblings)
5 siblings, 1 reply; 21+ messages in thread
From: Huang Jianan @ 2021-09-03 13:40 UTC (permalink / raw)
To: linux-erofs
From: Huang Jianan <huangjianan@oppo.com>
- Remove filename in the file since it's generally not useful.
- Get rid of all unnecessary trailing newline.
Signed-off-by: Huang Jianan <huangjianan@oppo.com>
---
AUTHORS | 1 -
ChangeLog | 1 -
Makefile.am | 2 --
README | 1 -
autogen.sh | 1 -
configure.ac | 1 -
fuse/Makefile.am | 2 --
fuse/dir.c | 3 ---
fuse/main.c | 3 ---
include/erofs/block_list.h | 2 --
include/erofs/cache.h | 3 ---
include/erofs/compress.h | 3 ---
include/erofs/config.h | 3 ---
include/erofs/decompress.h | 2 --
include/erofs/defs.h | 2 --
include/erofs/err.h | 3 ---
include/erofs/exclude.h | 3 ---
include/erofs/hashtable.h | 2 --
include/erofs/inode.h | 2 --
include/erofs/internal.h | 2 --
include/erofs/io.h | 3 ---
include/erofs/list.h | 2 --
include/erofs/print.h | 4 ----
include/erofs/trace.h | 3 ---
include/erofs/xattr.h | 2 --
include/erofs_fs.h | 2 --
lib/Makefile.am | 2 --
lib/block_list.c | 2 --
lib/cache.c | 3 ---
lib/compress.c | 3 ---
lib/compressor.c | 3 ---
lib/compressor.h | 3 ---
lib/compressor_lz4.c | 3 ---
lib/compressor_lz4hc.c | 3 ---
lib/config.c | 3 ---
lib/data.c | 3 ---
lib/decompress.c | 2 --
lib/exclude.c | 3 ---
lib/inode.c | 3 ---
lib/io.c | 2 --
lib/namei.c | 3 ---
lib/super.c | 3 ---
lib/xattr.c | 3 ---
lib/zmap.c | 2 --
man/Makefile.am | 1 -
man/mkfs.erofs.1 | 1 -
mkfs/Makefile.am | 2 --
mkfs/main.c | 2 --
48 files changed, 113 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 3487d44..dacbdda 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -6,4 +6,3 @@ R: Gao Xiang <xiang@kernel.org>
R: Chao Yu <yuchao0@huawei.com>
S: Maintained
L: linux-erofs@lists.ozlabs.org
-
diff --git a/ChangeLog b/ChangeLog
index 6637bc3..4c0c941 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -58,4 +58,3 @@ erofs-utils (1.0-1) unstable; urgency=low
- (mkfs.erofs) Posix ACL support;
-- Gao Xiang <xiang@kernel.org> Thu, 24 Oct 2019 00:00:00 +0800
-
diff --git a/Makefile.am b/Makefile.am
index b804aa9..20f0f7d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,4 @@
# SPDX-License-Identifier: GPL-2.0+
-# Makefile.am
ACLOCAL_AMFLAGS = -I m4
@@ -7,4 +6,3 @@ SUBDIRS = man lib mkfs
if ENABLE_FUSE
SUBDIRS += fuse
endif
-
diff --git a/README b/README
index af9cdf1..7b641f7 100644
--- a/README
+++ b/README
@@ -230,4 +230,3 @@ Comments
https://github.com/lz4/lz4/issues/783
which is also resolved in lz4-1.9.3.
-
diff --git a/autogen.sh b/autogen.sh
index 6816b11..fd81db4 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,4 +7,3 @@ autoconf && \
case `uname` in Darwin*) glibtoolize --copy ;; \
*) libtoolize --copy ;; esac && \
automake -a -c
-
diff --git a/configure.ac b/configure.ac
index 3510609..a749db0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -297,4 +297,3 @@ AC_CONFIG_FILES([Makefile
mkfs/Makefile
fuse/Makefile])
AC_OUTPUT
-
diff --git a/fuse/Makefile.am b/fuse/Makefile.am
index e7757bc..6893a97 100644
--- a/fuse/Makefile.am
+++ b/fuse/Makefile.am
@@ -1,5 +1,4 @@
# SPDX-License-Identifier: GPL-2.0+
-# Makefile.am
AUTOMAKE_OPTIONS = foreign
bin_PROGRAMS = erofsfuse
@@ -7,4 +6,3 @@ erofsfuse_SOURCES = dir.c main.c
erofsfuse_CFLAGS = -Wall -Werror -I$(top_srcdir)/include
erofsfuse_CFLAGS += -DFUSE_USE_VERSION=26 ${libfuse_CFLAGS} ${libselinux_CFLAGS}
erofsfuse_LDADD = $(top_builddir)/lib/liberofs.la ${libfuse_LIBS} ${liblz4_LIBS} ${libselinux_LIBS}
-
diff --git a/fuse/dir.c b/fuse/dir.c
index e16fda1..bc8735b 100644
--- a/fuse/dir.c
+++ b/fuse/dir.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/fuse/dir.c
- *
* Created by Li Guifu <blucerlee@gmail.com>
*/
#include <fuse.h>
@@ -100,4 +98,3 @@ int erofsfuse_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
}
return 0;
}
-
diff --git a/fuse/main.c b/fuse/main.c
index 5552480..fca4d7f 100644
--- a/fuse/main.c
+++ b/fuse/main.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/fuse/main.c
- *
* Created by Li Guifu <blucerlee@gmail.com>
*/
#include <stdlib.h>
@@ -249,4 +247,3 @@ err:
erofs_exit_configure();
return ret ? EXIT_FAILURE : EXIT_SUCCESS;
}
-
diff --git a/include/erofs/block_list.h b/include/erofs/block_list.h
index 7756d8a..5127b23 100644
--- a/include/erofs/block_list.h
+++ b/include/erofs/block_list.h
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/include/erofs/block_list.h
- *
* Copyright (C), 2021, Coolpad Group Limited.
* Created by Yue Hu <huyue2@yulong.com>
*/
diff --git a/include/erofs/cache.h b/include/erofs/cache.h
index 611ca5b..e324d92 100644
--- a/include/erofs/cache.h
+++ b/include/erofs/cache.h
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
- * erofs-utils/include/erofs/cache.h
- *
* Copyright (C) 2018 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Miao Xie <miaoxie@huawei.com>
@@ -102,4 +100,3 @@ bool erofs_bflush(struct erofs_buffer_block *bb);
void erofs_bdrop(struct erofs_buffer_head *bh, bool tryrevoke);
#endif
-
diff --git a/include/erofs/compress.h b/include/erofs/compress.h
index d234e8b..4434aaa 100644
--- a/include/erofs/compress.h
+++ b/include/erofs/compress.h
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
- * erofs-utils/include/erofs/compress.h
- *
* Copyright (C) 2019 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Gao Xiang <gaoxiang25@huawei.com>
@@ -24,4 +22,3 @@ int z_erofs_compress_exit(void);
const char *z_erofs_list_available_compressors(unsigned int i);
#endif
-
diff --git a/include/erofs/config.h b/include/erofs/config.h
index 8124f3b..95fc23e 100644
--- a/include/erofs/config.h
+++ b/include/erofs/config.h
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
- * erofs-utils/include/erofs/config.h
- *
* Copyright (C) 2018-2019 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Li Guifu <bluce.liguifu@huawei.com>
@@ -89,4 +87,3 @@ static inline int erofs_selabel_open(const char *file_contexts)
#endif
#endif
-
diff --git a/include/erofs/decompress.h b/include/erofs/decompress.h
index beaac35..0ba2b08 100644
--- a/include/erofs/decompress.h
+++ b/include/erofs/decompress.h
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
- * erofs-utils/include/erofs/decompress.h
- *
* Copyright (C), 2008-2020, OPPO Mobile Comm Corp., Ltd.
* Created by Huang Jianan <huangjianan@oppo.com>
*/
diff --git a/include/erofs/defs.h b/include/erofs/defs.h
index 5410685..6e0a777 100644
--- a/include/erofs/defs.h
+++ b/include/erofs/defs.h
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
- * erofs-utils/include/erofs/defs.h
- *
* Copyright (C) 2018 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Li Guifu <bluce.liguifu@huawei.com>
diff --git a/include/erofs/err.h b/include/erofs/err.h
index da3b681..a33bdd1 100644
--- a/include/erofs/err.h
+++ b/include/erofs/err.h
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
- * erofs-utils/include/erofs/err.h
- *
* Copyright (C) 2018 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Li Guifu <bluce.liguifu@huawei.com>
@@ -31,4 +29,3 @@ static inline long PTR_ERR(const void *ptr)
}
#endif
-
diff --git a/include/erofs/exclude.h b/include/erofs/exclude.h
index 88c55d7..6930f2b 100644
--- a/include/erofs/exclude.h
+++ b/include/erofs/exclude.h
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
- * erofs-utils/include/erofs/exclude.h
- *
* Created by Li Guifu <bluce.lee@aliyun.com>
*/
#ifndef __EROFS_EXCLUDE_H
@@ -24,4 +22,3 @@ int erofs_parse_exclude_path(const char *args, bool is_regex);
struct erofs_exclude_rule *erofs_is_exclude_path(const char *dir,
const char *name);
#endif
-
diff --git a/include/erofs/hashtable.h b/include/erofs/hashtable.h
index 7e47189..a71cb00 100644
--- a/include/erofs/hashtable.h
+++ b/include/erofs/hashtable.h
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */
/*
- * erofs-utils/include/erofs/hashtable.h
- *
* Original code taken from 'linux/include/linux/hash{,table}.h'
*/
#ifndef __EROFS_HASHTABLE_H
diff --git a/include/erofs/inode.h b/include/erofs/inode.h
index 5a7f5f1..a736762 100644
--- a/include/erofs/inode.h
+++ b/include/erofs/inode.h
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
- * erofs-utils/include/erofs/inode.h
- *
* Copyright (C) 2018-2019 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Li Guifu <bluce.liguifu@huawei.com>
diff --git a/include/erofs/internal.h b/include/erofs/internal.h
index 5583861..7dc5ff0 100644
--- a/include/erofs/internal.h
+++ b/include/erofs/internal.h
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
- * erofs-utils/include/erofs/internal.h
- *
* Copyright (C) 2019 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Gao Xiang <gaoxiang25@huawei.com>
diff --git a/include/erofs/io.h b/include/erofs/io.h
index 5574245..0763baf 100644
--- a/include/erofs/io.h
+++ b/include/erofs/io.h
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
- * erofs-utils/include/erofs/io.h
- *
* Copyright (C) 2018-2019 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Li Guifu <bluce.liguifu@huawei.com>
@@ -41,4 +39,3 @@ static inline int blk_read(void *buf, erofs_blk_t start,
}
#endif
-
diff --git a/include/erofs/list.h b/include/erofs/list.h
index 3572726..d2bc704 100644
--- a/include/erofs/list.h
+++ b/include/erofs/list.h
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
- * erofs-utils/include/erofs/list.h
- *
* Copyright (C) 2018 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Li Guifu <bluce.liguifu@huawei.com>
diff --git a/include/erofs/print.h b/include/erofs/print.h
index 6b79074..57b6607 100644
--- a/include/erofs/print.h
+++ b/include/erofs/print.h
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
- * erofs-utils/include/erofs/print.h
- *
* Copyright (C) 2018-2019 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Li Guifu <bluce.liguifu@huawei.com>
@@ -71,6 +69,4 @@ enum {
#define erofs_dump(fmt, ...) fprintf(stderr, fmt, ##__VA_ARGS__)
-
#endif
-
diff --git a/include/erofs/trace.h b/include/erofs/trace.h
index 5a12da7..d70d236 100644
--- a/include/erofs/trace.h
+++ b/include/erofs/trace.h
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
- * erofs-utils/include/erofs/trace.h
- *
* Copyright (C) 2020 Gao Xiang <hsiangkao@aol.com>
*/
#ifndef __EROFS_TRACE_H
@@ -11,4 +9,3 @@
#define trace_erofs_map_blocks_flatmode_exit(inode, map, flags, ret) ((void)0)
#endif
-
diff --git a/include/erofs/xattr.h b/include/erofs/xattr.h
index 197fe25..5086b54 100644
--- a/include/erofs/xattr.h
+++ b/include/erofs/xattr.h
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/include/erofs/xattr.h
- *
* Originally contributed by an anonymous person,
* heavily changed by Li Guifu <blucerlee@gmail.com>
* and Gao Xiang <xiang@kernel.org>
diff --git a/include/erofs_fs.h b/include/erofs_fs.h
index 18fc182..48934bb 100644
--- a/include/erofs_fs.h
+++ b/include/erofs_fs.h
@@ -1,6 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0-only OR Apache-2.0 */
/*
- * erofs-utils/include/erofs_fs.h
* EROFS (Enhanced ROM File System) on-disk format definition
*
* Copyright (C) 2017-2018 HUAWEI, Inc.
@@ -360,4 +359,3 @@ static inline void erofs_check_ondisk_layout_definitions(void)
}
#endif
-
diff --git a/lib/Makefile.am b/lib/Makefile.am
index b12e2c1..b5127c4 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,5 +1,4 @@
# SPDX-License-Identifier: GPL-2.0+
-# Makefile.am
noinst_LTLIBRARIES = liberofs.la
noinst_HEADERS = $(top_srcdir)/include/erofs_fs.h \
@@ -30,4 +29,3 @@ if ENABLE_LZ4HC
liberofs_la_SOURCES += compressor_lz4hc.c
endif
endif
-
diff --git a/lib/block_list.c b/lib/block_list.c
index 3be0992..73c1bde 100644
--- a/lib/block_list.c
+++ b/lib/block_list.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/lib/block_list.c
- *
* Copyright (C), 2021, Coolpad Group Limited.
* Created by Yue Hu <huyue2@yulong.com>
*/
diff --git a/lib/cache.c b/lib/cache.c
index 340dcdd..8016e38 100644
--- a/lib/cache.c
+++ b/lib/cache.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/lib/cache.c
- *
* Copyright (C) 2018-2019 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Miao Xie <miaoxie@huawei.com>
@@ -442,4 +440,3 @@ void erofs_bdrop(struct erofs_buffer_head *bh, bool tryrevoke)
if (rollback)
tail_blkaddr = blkaddr;
}
-
diff --git a/lib/compress.c b/lib/compress.c
index a8ebbc1..5ac9427 100644
--- a/lib/compress.c
+++ b/lib/compress.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/lib/compress.c
- *
* Copyright (C) 2018-2019 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Miao Xie <miaoxie@huawei.com>
@@ -680,4 +678,3 @@ int z_erofs_compress_exit(void)
{
return erofs_compressor_exit(&compresshandle);
}
-
diff --git a/lib/compressor.c b/lib/compressor.c
index 8836e0c..c14fc05 100644
--- a/lib/compressor.c
+++ b/lib/compressor.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/lib/compressor.c
- *
* Copyright (C) 2018-2019 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Gao Xiang <gaoxiang25@huawei.com>
@@ -91,4 +89,3 @@ int erofs_compressor_exit(struct erofs_compress *c)
return c->alg->exit(c);
return 0;
}
-
diff --git a/lib/compressor.h b/lib/compressor.h
index b2471c4..151c43d 100644
--- a/lib/compressor.h
+++ b/lib/compressor.h
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
- * erofs-utils/lib/compressor.h
- *
* Copyright (C) 2018-2019 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Gao Xiang <gaoxiang25@huawei.com>
@@ -53,4 +51,3 @@ int erofs_compressor_init(struct erofs_compress *c, char *alg_name);
int erofs_compressor_exit(struct erofs_compress *c);
#endif
-
diff --git a/lib/compressor_lz4.c b/lib/compressor_lz4.c
index 292d0f2..f71252e 100644
--- a/lib/compressor_lz4.c
+++ b/lib/compressor_lz4.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/lib/compressor-lz4.c
- *
* Copyright (C) 2018-2019 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Gao Xiang <gaoxiang25@huawei.com>
@@ -48,4 +46,3 @@ struct erofs_compressor erofs_compressor_lz4 = {
.exit = compressor_lz4_exit,
.compress_destsize = lz4_compress_destsize,
};
-
diff --git a/lib/compressor_lz4hc.c b/lib/compressor_lz4hc.c
index 14c3a71..0c912fb 100644
--- a/lib/compressor_lz4hc.c
+++ b/lib/compressor_lz4hc.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/lib/compressor-lz4hc.c
- *
* Copyright (C) 2018-2019 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Gao Xiang <gaoxiang25@huawei.com>
@@ -61,4 +59,3 @@ struct erofs_compressor erofs_compressor_lz4hc = {
.exit = compressor_lz4hc_exit,
.compress_destsize = lz4hc_compress_destsize,
};
-
diff --git a/lib/config.c b/lib/config.c
index 99fcf49..4757dbb 100644
--- a/lib/config.c
+++ b/lib/config.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/lib/config.c
- *
* Copyright (C) 2018-2019 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Li Guifu <bluce.liguifu@huawei.com>
@@ -85,4 +83,3 @@ int erofs_selabel_open(const char *file_contexts)
return 0;
}
#endif
-
diff --git a/lib/data.c b/lib/data.c
index 42b4904..1a1005a 100644
--- a/lib/data.c
+++ b/lib/data.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/lib/data.c
- *
* Copyright (C) 2020 Gao Xiang <hsiangkao@aol.com>
* Compression support by Huang Jianan <huangjianan@oppo.com>
*/
@@ -217,4 +215,3 @@ int erofs_pread(struct erofs_inode *inode, char *buf,
}
return -EINVAL;
}
-
diff --git a/lib/decompress.c b/lib/decompress.c
index 490c4bc..2ee1439 100644
--- a/lib/decompress.c
+++ b/lib/decompress.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/lib/decompress.c
- *
* Copyright (C), 2008-2020, OPPO Mobile Comm Corp., Ltd.
* Created by Huang Jianan <huangjianan@oppo.com>
*/
diff --git a/lib/exclude.c b/lib/exclude.c
index 73b3720..2f980a3 100644
--- a/lib/exclude.c
+++ b/lib/exclude.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/lib/exclude.c
- *
* Created by Li Guifu <bluce.lee@aliyun.com>
*/
#include <string.h>
@@ -129,4 +127,3 @@ struct erofs_exclude_rule *erofs_is_exclude_path(const char *dir,
}
return NULL;
}
-
diff --git a/lib/inode.c b/lib/inode.c
index 6871d2b..97ee2c9 100644
--- a/lib/inode.c
+++ b/lib/inode.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/lib/inode.c
- *
* Copyright (C) 2018-2019 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Li Guifu <bluce.liguifu@huawei.com>
@@ -1100,4 +1098,3 @@ struct erofs_inode *erofs_mkfs_build_tree_from_path(struct erofs_inode *parent,
return erofs_mkfs_build_tree(inode);
}
-
diff --git a/lib/io.c b/lib/io.c
index 6067041..b053137 100644
--- a/lib/io.c
+++ b/lib/io.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/lib/io.c
- *
* Copyright (C) 2018 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Li Guifu <bluce.liguifu@huawei.com>
diff --git a/lib/namei.c b/lib/namei.c
index b572d17..755a5ad 100644
--- a/lib/namei.c
+++ b/lib/namei.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/lib/namei.c
- *
* Created by Li Guifu <blucerlee@gmail.com>
*/
#include <sys/types.h>
@@ -262,4 +260,3 @@ int erofs_ilookup(const char *path, struct erofs_inode *vi)
vi->nid = nd.nid;
return erofs_read_inode_from_disk(vi);
}
-
diff --git a/lib/super.c b/lib/super.c
index 11405ec..0fa69ab 100644
--- a/lib/super.c
+++ b/lib/super.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/lib/super.c
- *
* Created by Li Guifu <blucerlee@gmail.com>
*/
#include <string.h>
@@ -71,4 +69,3 @@ int erofs_read_superblock(void)
memcpy(&sbi.uuid, dsb->uuid, sizeof(dsb->uuid));
return 0;
}
-
diff --git a/lib/xattr.c b/lib/xattr.c
index aff3d67..ffc5f7a 100644
--- a/lib/xattr.c
+++ b/lib/xattr.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/lib/xattr.c
- *
* Originally contributed by an anonymous person,
* heavily changed by Li Guifu <blucerlee@gmail.com>
* and Gao Xiang <hsiangkao@aol.com>
@@ -687,4 +685,3 @@ char *erofs_export_xattr_ibody(struct list_head *ixattrs, unsigned int size)
DBG_BUGON(p > size);
return buf;
}
-
diff --git a/lib/zmap.c b/lib/zmap.c
index 1084faa..fdc84af 100644
--- a/lib/zmap.c
+++ b/lib/zmap.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * erofs-utils/lib/zmap.c
- *
* (a large amount of code was adapted from Linux kernel. )
*
* Copyright (C) 2018-2019 HUAWEI, Inc.
diff --git a/man/Makefile.am b/man/Makefile.am
index 0df947b..d62d6e2 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,5 +1,4 @@
# SPDX-License-Identifier: GPL-2.0+
-# Makefile.am
dist_man_MANS = mkfs.erofs.1
diff --git a/man/mkfs.erofs.1 b/man/mkfs.erofs.1
index d164fa5..bc0a10b 100644
--- a/man/mkfs.erofs.1
+++ b/man/mkfs.erofs.1
@@ -99,4 +99,3 @@ This manual page was written by Gao Xiang <xiang@kernel.org>.
git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git.
.SH SEE ALSO
.BR mkfs (8).
-
diff --git a/mkfs/Makefile.am b/mkfs/Makefile.am
index 8b8e051..e488f86 100644
--- a/mkfs/Makefile.am
+++ b/mkfs/Makefile.am
@@ -1,5 +1,4 @@
# SPDX-License-Identifier: GPL-2.0+
-# Makefile.am
AUTOMAKE_OPTIONS = foreign
bin_PROGRAMS = mkfs.erofs
@@ -7,4 +6,3 @@ AM_CPPFLAGS = ${libuuid_CFLAGS} ${libselinux_CFLAGS}
mkfs_erofs_SOURCES = main.c
mkfs_erofs_CFLAGS = -Wall -Werror -I$(top_srcdir)/include
mkfs_erofs_LDADD = ${libuuid_LIBS} $(top_builddir)/lib/liberofs.la ${libselinux_LIBS} ${liblz4_LIBS}
-
diff --git a/mkfs/main.c b/mkfs/main.c
index 89f2310..debb754 100644
--- a/mkfs/main.c
+++ b/mkfs/main.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * mkfs/main.c
- *
* Copyright (C) 2018-2019 HUAWEI, Inc.
* http://www.huawei.com/
* Created by Li Guifu <bluce.liguifu@huawei.com>
--
2.25.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH V2 2/6] erofs-utils: fix SPDX comment style
2021-09-03 13:40 ` [PATCH V2 0/6] erofs-utils: fix checkpatch.pl complains Huang Jianan
2021-09-03 13:40 ` [PATCH V2 1/6] erofs-utils: clean up file headers & footers Huang Jianan
@ 2021-09-03 13:40 ` Huang Jianan
2021-09-03 13:40 ` [PATCH V2 3/6] erofs-utils: fix general style problem Huang Jianan
` (3 subsequent siblings)
5 siblings, 0 replies; 21+ messages in thread
From: Huang Jianan @ 2021-09-03 13:40 UTC (permalink / raw)
To: linux-erofs
From: Huang Jianan <huangjianan@oppo.com>
Signed-off-by: Huang Jianan <huangjianan@oppo.com>
---
fuse/macosx.h | 1 +
include/erofs/block_list.h | 2 +-
include/erofs/xattr.h | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/fuse/macosx.h b/fuse/macosx.h
index 372eba6..81ac47f 100644
--- a/fuse/macosx.h
+++ b/fuse/macosx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
#ifdef __APPLE__
#undef LIST_HEAD
#endif
diff --git a/include/erofs/block_list.h b/include/erofs/block_list.h
index 5127b23..fca476a 100644
--- a/include/erofs/block_list.h
+++ b/include/erofs/block_list.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C), 2021, Coolpad Group Limited.
* Created by Yue Hu <huyue2@yulong.com>
diff --git a/include/erofs/xattr.h b/include/erofs/xattr.h
index 5086b54..f0c4c26 100644
--- a/include/erofs/xattr.h
+++ b/include/erofs/xattr.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Originally contributed by an anonymous person,
* heavily changed by Li Guifu <blucerlee@gmail.com>
--
2.25.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH V2 3/6] erofs-utils: fix general style problem
2021-09-03 13:40 ` [PATCH V2 0/6] erofs-utils: fix checkpatch.pl complains Huang Jianan
2021-09-03 13:40 ` [PATCH V2 1/6] erofs-utils: clean up file headers & footers Huang Jianan
2021-09-03 13:40 ` [PATCH V2 2/6] erofs-utils: fix SPDX comment style Huang Jianan
@ 2021-09-03 13:40 ` Huang Jianan
2021-09-03 13:40 ` [PATCH V2 4/6] erofs-utils: remove unnecessary codes Huang Jianan
` (2 subsequent siblings)
5 siblings, 0 replies; 21+ messages in thread
From: Huang Jianan @ 2021-09-03 13:40 UTC (permalink / raw)
To: linux-erofs
From: Huang Jianan <huangjianan@oppo.com>
Signed-off-by: Huang Jianan <huangjianan@oppo.com>
---
include/erofs/block_list.h | 4 ++--
lib/block_list.c | 5 +----
lib/compress.c | 9 ++++-----
lib/compressor.c | 2 +-
lib/namei.c | 3 ++-
lib/xattr.c | 2 +-
mkfs/main.c | 2 +-
7 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/include/erofs/block_list.h b/include/erofs/block_list.h
index fca476a..dcc0e50 100644
--- a/include/erofs/block_list.h
+++ b/include/erofs/block_list.h
@@ -18,8 +18,8 @@ void erofs_droid_blocklist_write_tail_end(struct erofs_inode *inode,
#else
static inline void erofs_droid_blocklist_write(struct erofs_inode *inode,
erofs_blk_t blk_start, erofs_blk_t nblocks) {}
-static inline
-void erofs_droid_blocklist_write_tail_end(struct erofs_inode *inode,
+static inline void
+erofs_droid_blocklist_write_tail_end(struct erofs_inode *inode,
erofs_blk_t blkaddr) {}
#endif
#endif
diff --git a/lib/block_list.c b/lib/block_list.c
index 73c1bde..15bb5cf 100644
--- a/lib/block_list.c
+++ b/lib/block_list.c
@@ -11,13 +11,10 @@
#define pr_fmt(fmt) "EROFS block_list: " FUNC_LINE_FMT fmt "\n"
#include "erofs/print.h"
-static FILE *block_list_fp = NULL;
+static FILE *block_list_fp;
int erofs_droid_blocklist_fopen(void)
{
- if (block_list_fp)
- return 0;
-
block_list_fp = fopen(cfg.block_list_file, "w");
if (!block_list_fp)
diff --git a/lib/compress.c b/lib/compress.c
index 5ac9427..6df30ea 100644
--- a/lib/compress.c
+++ b/lib/compress.c
@@ -292,13 +292,12 @@ static void *write_compacted_indexes(u8 *out,
bool update_blkaddr;
erofs_blk_t blkaddr;
- if (destsize == 4) {
+ if (destsize == 4)
vcnt = 2;
- } else if (destsize == 2 && logical_clusterbits == 12) {
+ else if (destsize == 2 && logical_clusterbits == 12)
vcnt = 16;
- } else {
+ else
return ERR_PTR(-EINVAL);
- }
encodebits = (vcnt * destsize * 8 - 32) / vcnt;
blkaddr = *blkaddr_ret;
update_blkaddr = erofs_sb_has_big_pcluster();
@@ -467,8 +466,8 @@ int erofs_write_compressed_file(struct erofs_inode *inode)
erofs_blk_t blkaddr, compressed_blocks;
unsigned int legacymetasize;
int ret, fd;
-
u8 *compressmeta = malloc(vle_compressmeta_capacity(inode->i_size));
+
if (!compressmeta)
return -ENOMEM;
diff --git a/lib/compressor.c b/lib/compressor.c
index c14fc05..1f1a33d 100644
--- a/lib/compressor.c
+++ b/lib/compressor.c
@@ -26,7 +26,7 @@ int erofs_compress_destsize(struct erofs_compress *c,
void *dst,
unsigned int dstsize)
{
- unsigned uncompressed_size;
+ unsigned int uncompressed_size;
int ret;
DBG_BUGON(!c->alg);
diff --git a/lib/namei.c b/lib/namei.c
index 755a5ad..f96e400 100644
--- a/lib/namei.c
+++ b/lib/namei.c
@@ -243,7 +243,8 @@ static int link_path_walk(const char *name, struct nameidata *nd)
name = p;
/* Skip until no more slashes. */
- for (name = p; *name == '/'; ++name);
+ for (name = p; *name == '/'; ++name)
+ ;
}
return 0;
}
diff --git a/lib/xattr.c b/lib/xattr.c
index ffc5f7a..196133a 100644
--- a/lib/xattr.c
+++ b/lib/xattr.c
@@ -215,7 +215,7 @@ static struct xattr_item *erofs_get_selabel_xattr(const char *srcpath,
erofs_fspath(srcpath));
else
#endif
- ret = asprintf(&fspath, "/%s", erofs_fspath(srcpath));
+ ret = asprintf(&fspath, "/%s", erofs_fspath(srcpath));
if (ret <= 0)
return ERR_PTR(-ENOMEM);
diff --git a/mkfs/main.c b/mkfs/main.c
index debb754..40ca94f 100644
--- a/mkfs/main.c
+++ b/mkfs/main.c
@@ -174,7 +174,7 @@ static int mkfs_parse_options_cfg(int argc, char *argv[])
char *endptr;
int opt, i;
- while((opt = getopt_long(argc, argv, "d:x:z:E:T:U:C:",
+ while ((opt = getopt_long(argc, argv, "d:x:z:E:T:U:C:",
long_options, NULL)) != -1) {
switch (opt) {
case 'z':
--
2.25.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH V2 4/6] erofs-utils: remove unnecessary codes
2021-09-03 13:40 ` [PATCH V2 0/6] erofs-utils: fix checkpatch.pl complains Huang Jianan
` (2 preceding siblings ...)
2021-09-03 13:40 ` [PATCH V2 3/6] erofs-utils: fix general style problem Huang Jianan
@ 2021-09-03 13:40 ` Huang Jianan
2021-09-03 15:10 ` Gao Xiang
2021-09-03 13:40 ` [PATCH V2 5/6] erofs-utils: fix print style Huang Jianan
2021-09-03 13:40 ` [PATCH V2 6/6] erofs-utils: add missing /* fallthrough */ Huang Jianan
5 siblings, 1 reply; 21+ messages in thread
From: Huang Jianan @ 2021-09-03 13:40 UTC (permalink / raw)
To: linux-erofs
From: Huang Jianan <huangjianan@oppo.com>
Signed-off-by: Huang Jianan <huangjianan@oppo.com>
---
fuse/main.c | 5 +----
lib/inode.c | 4 ----
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/fuse/main.c b/fuse/main.c
index fca4d7f..8137421 100644
--- a/fuse/main.c
+++ b/fuse/main.c
@@ -109,16 +109,13 @@ static struct options {
bool odebug;
} fusecfg;
-#define OPTION(t, p) \
- { t, offsetof(struct options, p), 1 }
+#define OPTION(t, p) { t, offsetof(struct options, p), 1 }
static const struct fuse_opt option_spec[] = {
OPTION("--dbglevel=%u", debug_lvl),
OPTION("--help", show_help),
FUSE_OPT_END
};
-#define OPTION(t, p) { t, offsetof(struct options, p), 1 }
-
static void usage(void)
{
struct fuse_args args = FUSE_ARGS_INIT(0, NULL);
diff --git a/lib/inode.c b/lib/inode.c
index 97ee2c9..61dc802 100644
--- a/lib/inode.c
+++ b/lib/inode.c
@@ -677,11 +677,7 @@ out:
* Don't leave DATA buffers which were written in the global
* buffer list. It will make balloc() slowly.
*/
-#if 0
- bh->op = &erofs_drop_directly_bhops;
-#else
erofs_bdrop(bh, false);
-#endif
inode->bh_data = NULL;
}
return 0;
--
2.25.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH V2 5/6] erofs-utils: fix print style
2021-09-03 13:40 ` [PATCH V2 0/6] erofs-utils: fix checkpatch.pl complains Huang Jianan
` (3 preceding siblings ...)
2021-09-03 13:40 ` [PATCH V2 4/6] erofs-utils: remove unnecessary codes Huang Jianan
@ 2021-09-03 13:40 ` Huang Jianan
2021-09-03 13:40 ` [PATCH V2 6/6] erofs-utils: add missing /* fallthrough */ Huang Jianan
5 siblings, 0 replies; 21+ messages in thread
From: Huang Jianan @ 2021-09-03 13:40 UTC (permalink / raw)
To: linux-erofs
From: Huang Jianan <huangjianan@oppo.com>
Fix warning "quoted string split across lines".
Signed-off-by: Huang Jianan <huangjianan@oppo.com>
---
lib/inode.c | 3 +--
lib/io.c | 3 +--
lib/zmap.c | 3 +--
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/lib/inode.c b/lib/inode.c
index 61dc802..6024e8c 100644
--- a/lib/inode.c
+++ b/lib/inode.c
@@ -741,8 +741,7 @@ int erofs_droid_inode_fsconfig(struct erofs_inode *inode,
cfg.target_out_path,
&uid, &gid, &mode, &inode->capabilities);
- erofs_dbg("/%s -> mode = 0x%x, uid = 0x%x, gid = 0x%x, "
- "capabilities = 0x%" PRIx64 "\n",
+ erofs_dbg("/%s -> mode = 0x%x, uid = 0x%x, gid = 0x%x, capabilities = 0x%" PRIx64 "\n",
fspath, mode, uid, gid, inode->capabilities);
if (decorated)
diff --git a/lib/io.c b/lib/io.c
index b053137..620cb9c 100644
--- a/lib/io.c
+++ b/lib/io.c
@@ -242,8 +242,7 @@ int dev_read(void *buf, u64 offset, size_t len)
}
if (offset >= erofs_devsz || len > erofs_devsz ||
offset > erofs_devsz - len) {
- erofs_err("read posion[%" PRIu64 ", %zd] is too large beyond"
- "the end of device(%" PRIu64 ").",
+ erofs_err("read posion[%" PRIu64 ", %zd] is too large beyond the end of device(%" PRIu64 ").",
offset, len, erofs_devsz);
return -EINVAL;
}
diff --git a/lib/zmap.c b/lib/zmap.c
index fdc84af..ce79601 100644
--- a/lib/zmap.c
+++ b/lib/zmap.c
@@ -57,8 +57,7 @@ static int z_erofs_fill_inode_lazy(struct erofs_inode *vi)
if (vi->datalayout == EROFS_INODE_FLAT_COMPRESSION &&
!(vi->z_advise & Z_EROFS_ADVISE_BIG_PCLUSTER_1) ^
!(vi->z_advise & Z_EROFS_ADVISE_BIG_PCLUSTER_2)) {
- erofs_err(
-"big pcluster head1/2 of compact indexes should be consistent for nid %llu",
+ erofs_err("big pcluster head1/2 of compact indexes should be consistent for nid %llu",
vi->nid * 1ULL);
return -EFSCORRUPTED;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH V2 6/6] erofs-utils: add missing /* fallthrough */
2021-09-03 13:40 ` [PATCH V2 0/6] erofs-utils: fix checkpatch.pl complains Huang Jianan
` (4 preceding siblings ...)
2021-09-03 13:40 ` [PATCH V2 5/6] erofs-utils: fix print style Huang Jianan
@ 2021-09-03 13:40 ` Huang Jianan
2021-09-03 15:21 ` Gao Xiang
5 siblings, 1 reply; 21+ messages in thread
From: Huang Jianan @ 2021-09-03 13:40 UTC (permalink / raw)
To: linux-erofs
From: Huang Jianan <huangjianan@oppo.com>
Signed-off-by: Huang Jianan <huangjianan@oppo.com>
---
lib/zmap.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lib/zmap.c b/lib/zmap.c
index ce79601..458030b 100644
--- a/lib/zmap.c
+++ b/lib/zmap.c
@@ -360,6 +360,7 @@ static int z_erofs_extent_lookback(struct z_erofs_maprecorder *m,
return z_erofs_extent_lookback(m, m->delta[0]);
case Z_EROFS_VLE_CLUSTER_TYPE_PLAIN:
map->m_flags &= ~EROFS_MAP_ZIPPED;
+ /* fallthrough */
case Z_EROFS_VLE_CLUSTER_TYPE_HEAD:
map->m_la = (lcn << lclusterbits) | m->clusterofs;
break;
@@ -479,6 +480,7 @@ int z_erofs_map_blocks_iter(struct erofs_inode *vi,
case Z_EROFS_VLE_CLUSTER_TYPE_PLAIN:
if (endoff >= m.clusterofs)
map->m_flags &= ~EROFS_MAP_ZIPPED;
+ /* fallthrough */
case Z_EROFS_VLE_CLUSTER_TYPE_HEAD:
if (endoff >= m.clusterofs) {
map->m_la = (m.lcn << lclusterbits) | m.clusterofs;
@@ -494,6 +496,7 @@ int z_erofs_map_blocks_iter(struct erofs_inode *vi,
end = (m.lcn << lclusterbits) | m.clusterofs;
map->m_flags |= EROFS_MAP_FULL_MAPPED;
m.delta[0] = 1;
+ /* fallthrough */
case Z_EROFS_VLE_CLUSTER_TYPE_NONHEAD:
/* get the correspoinding first chunk */
err = z_erofs_extent_lookback(&m, m.delta[0]);
--
2.25.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* Re: [PATCH V2 1/6] erofs-utils: clean up file headers & footers
2021-09-03 13:40 ` [PATCH V2 1/6] erofs-utils: clean up file headers & footers Huang Jianan
@ 2021-09-03 15:03 ` Gao Xiang
0 siblings, 0 replies; 21+ messages in thread
From: Gao Xiang @ 2021-09-03 15:03 UTC (permalink / raw)
To: Huang Jianan; +Cc: linux-erofs
On Fri, Sep 03, 2021 at 09:40:30PM +0800, Huang Jianan wrote:
> From: Huang Jianan <huangjianan@oppo.com>
>
> - Remove filename in the file since it's generally not useful.
> - Get rid of all unnecessary trailing newline.
>
> Signed-off-by: Huang Jianan <huangjianan@oppo.com>
Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Thanks,
Gao Xiang
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH V2 4/6] erofs-utils: remove unnecessary codes
2021-09-03 13:40 ` [PATCH V2 4/6] erofs-utils: remove unnecessary codes Huang Jianan
@ 2021-09-03 15:10 ` Gao Xiang
0 siblings, 0 replies; 21+ messages in thread
From: Gao Xiang @ 2021-09-03 15:10 UTC (permalink / raw)
To: Huang Jianan; +Cc: linux-erofs
On Fri, Sep 03, 2021 at 09:40:33PM +0800, Huang Jianan wrote:
> From: Huang Jianan <huangjianan@oppo.com>
>
> Signed-off-by: Huang Jianan <huangjianan@oppo.com>
Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Thanks,
Gao Xiang
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH V2 6/6] erofs-utils: add missing /* fallthrough */
2021-09-03 13:40 ` [PATCH V2 6/6] erofs-utils: add missing /* fallthrough */ Huang Jianan
@ 2021-09-03 15:21 ` Gao Xiang
0 siblings, 0 replies; 21+ messages in thread
From: Gao Xiang @ 2021-09-03 15:21 UTC (permalink / raw)
To: Huang Jianan; +Cc: linux-erofs
On Fri, Sep 03, 2021 at 09:40:35PM +0800, Huang Jianan wrote:
> From: Huang Jianan <huangjianan@oppo.com>
>
> Signed-off-by: Huang Jianan <huangjianan@oppo.com>
Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Thanks,
Gao Xiang
^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2021-09-03 15:22 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-31 16:51 [PATCH 0/5] erofs-utils: fix checkpatch.pl complains Huang Jianan
2021-08-31 16:51 ` [PATCH 1/5] erofs-utils: remove filename in the file Huang Jianan
2021-09-03 3:09 ` Gao Xiang
2021-08-31 16:51 ` [PATCH 2/5] erofs-utils: fix SPDX comment style Huang Jianan
2021-09-03 3:10 ` Gao Xiang
2021-08-31 16:51 ` [PATCH 3/5] erofs-utils: fix general style problem Huang Jianan
2021-09-03 3:12 ` Gao Xiang
2021-08-31 16:51 ` [PATCH 4/5] erofs-utils: remove unnecessary codes and comments Huang Jianan
2021-09-03 3:17 ` Gao Xiang
2021-08-31 16:51 ` [PATCH 5/5] erofs-utils: fix print style Huang Jianan
2021-09-03 3:18 ` Gao Xiang
2021-09-03 13:40 ` [PATCH V2 0/6] erofs-utils: fix checkpatch.pl complains Huang Jianan
2021-09-03 13:40 ` [PATCH V2 1/6] erofs-utils: clean up file headers & footers Huang Jianan
2021-09-03 15:03 ` Gao Xiang
2021-09-03 13:40 ` [PATCH V2 2/6] erofs-utils: fix SPDX comment style Huang Jianan
2021-09-03 13:40 ` [PATCH V2 3/6] erofs-utils: fix general style problem Huang Jianan
2021-09-03 13:40 ` [PATCH V2 4/6] erofs-utils: remove unnecessary codes Huang Jianan
2021-09-03 15:10 ` Gao Xiang
2021-09-03 13:40 ` [PATCH V2 5/6] erofs-utils: fix print style Huang Jianan
2021-09-03 13:40 ` [PATCH V2 6/6] erofs-utils: add missing /* fallthrough */ Huang Jianan
2021-09-03 15:21 ` Gao Xiang
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).