Merge tag 'erofs-for-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs

Pull erofs updates from Gao Xiang:
"No noticable change available for this cycle. Just a bugfix related to
sb chksum feature, two minor cleanups and Chao's email address update:

- fix wrong error code overwritten due to sb checksum feature

- two minor cleanups

- update Chao's email address"

* tag 'erofs-for-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs:
MAINTAINERS: erofs: update my email address
erofs: clean up file headers & footers
erofs: remove the occupied parameter from z_erofs_pagevec_enqueue()
erofs: fix error return code in erofs_read_superblock()

MAINTAINERS

···
 
 EROFS FILE SYSTEM
 M:	Gao Xiang <[e-mail]>
-M:	Chao Yu <[e-mail]>
+M:	Chao Yu <[e-mail]>
 L:	[e-mail]
 S:	Maintained
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git

fs/erofs/Kconfig

···
 	  Enable fixed-sized output compression for EROFS.
 
 	  If you don't want to enable compression feature, say N.
-

fs/erofs/compress.h

···
 /*
  * Copyright (C) 2019 HUAWEI, Inc.
  *             https://www.huawei.com/
- * Created by Gao Xiang <[e-mail]>
  */
 #ifndef __EROFS_FS_COMPRESS_H
 #define __EROFS_FS_COMPRESS_H
···
 		       struct list_head *pagepool);
 
 #endif
-

fs/erofs/data.c

···
 /*
  * Copyright (C) 2017-2018 HUAWEI, Inc.
  *             https://www.huawei.com/
- * Created by Gao Xiang <[e-mail]>
  */
 #include "internal.h"
 #include <linux/prefetch.h>
···
 	.readahead = erofs_raw_access_readahead,
 	.bmap = erofs_bmap,
 };
-

fs/erofs/decompressor.c

···
 /*
  * Copyright (C) 2019 HUAWEI, Inc.
  *             https://www.huawei.com/
- * Created by Gao Xiang <[e-mail]>
  */
 #include "compress.h"
 #include <linux/module.h>
···
 		return z_erofs_shifted_transform(rq, pagepool);
 	return z_erofs_decompress_generic(rq, pagepool);
 }
-

fs/erofs/dir.c

···
 /*
  * Copyright (C) 2017-2018 HUAWEI, Inc.
  *             https://www.huawei.com/
- * Created by Gao Xiang <[e-mail]>
  */
 #include "internal.h"
 
···
 	.read		= generic_read_dir,
 	.iterate_shared	= erofs_readdir,
 };
-

fs/erofs/erofs_fs.h

···
  *
  * Copyright (C) 2017-2018 HUAWEI, Inc.
  *             https://www.huawei.com/
- * Created by Gao Xiang <[e-mail]>
  */
 #ifndef __EROFS_FS_H
 #define __EROFS_FS_H
···
 }
 
 #endif
-

fs/erofs/inode.c

···
 /*
  * Copyright (C) 2017-2018 HUAWEI, Inc.
  *             https://www.huawei.com/
- * Created by Gao Xiang <[e-mail]>
  */
 #include "xattr.h"
 
···
 	.listxattr = erofs_listxattr,
 	.get_acl = erofs_get_acl,
 };
-

fs/erofs/internal.h

···
 /*
  * Copyright (C) 2017-2018 HUAWEI, Inc.
  *             https://www.huawei.com/
- * Created by Gao Xiang <[e-mail]>
  */
 #ifndef __EROFS_INTERNAL_H
 #define __EROFS_INTERNAL_H
···
 #define EFSCORRUPTED    EUCLEAN         /* Filesystem is corrupted */
 
 #endif	/* __EROFS_INTERNAL_H */
-

fs/erofs/namei.c

···
 /*
  * Copyright (C) 2017-2018 HUAWEI, Inc.
  *             https://www.huawei.com/
- * Created by Gao Xiang <[e-mail]>
  */
 #include "xattr.h"
 
···
 	.listxattr = erofs_listxattr,
 	.get_acl = erofs_get_acl,
 };
-

fs/erofs/super.c

···
 /*
  * Copyright (C) 2017-2018 HUAWEI, Inc.
  *             https://www.huawei.com/
- * Created by Gao Xiang <[e-mail]>
  */
 #include <linux/module.h>
 #include <linux/buffer_head.h>
···
 			goto out;
 	}
 
+	ret = -EINVAL;
 	blkszbits = dsb->blkszbits;
 	/* 9(512 bytes) + LOG_SECTORS_PER_BLOCK == LOG_BLOCK_SIZE */
 	if (blkszbits != LOG_BLOCK_SIZE) {
···
 MODULE_DESCRIPTION("Enhanced ROM File System");
 MODULE_AUTHOR("Gao Xiang, Chao Yu, Miao Xie, CONSUMER BG, HUAWEI Inc.");
 MODULE_LICENSE("GPL");
-

fs/erofs/tagptr.h

···
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * A tagged pointer implementation
- *
- * Copyright (C) 2018 Gao Xiang <[e-mail]>
  */
 #ifndef __EROFS_FS_TAGPTR_H
 #define __EROFS_FS_TAGPTR_H
···
 *ptptr; })
 
 #endif	/* __EROFS_FS_TAGPTR_H */
-

fs/erofs/utils.c

···
 /*
  * Copyright (C) 2018 HUAWEI, Inc.
  *             https://www.huawei.com/
- * Created by Gao Xiang <[e-mail]>
  */
 #include "internal.h"
 #include <linux/pagevec.h>
···
 	unregister_shrinker(&erofs_shrinker_info);
 }
 #endif	/* !CONFIG_EROFS_FS_ZIP */
-

fs/erofs/xattr.c

···
 /*
  * Copyright (C) 2017-2018 HUAWEI, Inc.
  *             https://www.huawei.com/
- * Created by Gao Xiang <[e-mail]>
  */
 #include <linux/security.h>
 #include "xattr.h"
···
 	return acl;
 }
 #endif
-

fs/erofs/xattr.h

···
 /*
  * Copyright (C) 2017-2018 HUAWEI, Inc.
  *             https://www.huawei.com/
- * Created by Gao Xiang <[e-mail]>
  */
 #ifndef __EROFS_XATTR_H
 #define __EROFS_XATTR_H

fs/erofs/zdata.c

···
 /*
  * Copyright (C) 2018 HUAWEI, Inc.
  *             https://www.huawei.com/
- * Created by Gao Xiang <[e-mail]>
  */
 #include "zdata.h"
 #include "compress.h"
···
 			       enum z_erofs_page_type type)
 {
 	int ret;
-	bool occupied;
 
 	/* give priority for inplaceio */
 	if (clt->mode >= COLLECT_PRIMARY &&
···
 	    z_erofs_try_inplace_io(clt, page))
 		return 0;
 
-	ret = z_erofs_pagevec_enqueue(&clt->vector,
-				      page, type, &occupied);
+	ret = z_erofs_pagevec_enqueue(&clt->vector, page, type);
 	clt->cl->vcnt += (unsigned int)ret;
 
 	return ret ? 0 : -EAGAIN;
···
 	.readpage = z_erofs_readpage,
 	.readahead = z_erofs_readahead,
 };
-

fs/erofs/zdata.h

···
 /*
  * Copyright (C) 2018 HUAWEI, Inc.
  *             https://www.huawei.com/
- * Created by Gao Xiang <[e-mail]>
  */
 #ifndef __EROFS_FS_ZDATA_H
 #define __EROFS_FS_ZDATA_H

fs/erofs/zmap.c

···
 /*
  * Copyright (C) 2018-2019 HUAWEI, Inc.
  *             https://www.huawei.com/
- * Created by Gao Xiang <[e-mail]>
  */
 #include "internal.h"
 #include <asm/unaligned.h>
···
 	DBG_BUGON(err < 0 && err != -ENOMEM);
 	return err;
 }
-

fs/erofs/zpvec.h

···
 /*
  * Copyright (C) 2018 HUAWEI, Inc.
  *             https://www.huawei.com/
- * Created by Gao Xiang <[e-mail]>
  */
 #ifndef __EROFS_FS_ZPVEC_H
 #define __EROFS_FS_ZPVEC_H
···
 
 static inline bool z_erofs_pagevec_enqueue(struct z_erofs_pagevec_ctor *ctor,
 					   struct page *page,
-					   enum z_erofs_page_type type,
-					   bool *occupied)
+					   enum z_erofs_page_type type)
 {
-	*occupied = false;
 	if (!ctor->next && type)
 		if (ctor->index + 1 == ctor->nr)
 			return false;
···
 	/* should remind that collector->next never equal to 1, 2 */
 	if (type == (uintptr_t)ctor->next) {
 		ctor->next = page;
-		*occupied = true;
 	}
 	ctor->pages[ctor->index++] = tagptr_fold(erofs_vtptr_t, page, type);
 	return true;
···
 	return tagptr_unfold_ptr(t);
 }
 #endif
-