Commit 7aed4d57 authored Jun 28, 2021 by Linus Torvalds

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()

parents a58e2035 8215d5b7

MAINTAINERS

+1 −1

Original line number	Diff line number	Diff line
		@@ -6786,7 +6786,7 @@ F: include/video/s1d13xxxfb.h

		EROFS FILE SYSTEM
		M: Gao Xiang <xiang@kernel.org>
		M: Chao Yu <yuchao0@huawei.com>
		M: Chao Yu <chao@kernel.org>
		L: linux-erofs@lists.ozlabs.org
		S: Maintained
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git

fs/erofs/Kconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -75,4 +75,3 @@ config EROFS_FS_ZIP
		Enable fixed-sized output compression for EROFS.

		If you don't want to enable compression feature, say N.

fs/erofs/compress.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -2,7 +2,6 @@
		/*
		* Copyright (C) 2019 HUAWEI, Inc.
		* https://www.huawei.com/
		* Created by Gao Xiang <gaoxiang25@huawei.com>
		*/
		#ifndef __EROFS_FS_COMPRESS_H
		#define __EROFS_FS_COMPRESS_H
		@@ -85,4 +84,3 @@ int z_erofs_decompress(struct z_erofs_decompress_req *rq,
		struct list_head *pagepool);

		#endif

fs/erofs/data.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -2,7 +2,6 @@
		/*
		* Copyright (C) 2017-2018 HUAWEI, Inc.
		* https://www.huawei.com/
		* Created by Gao Xiang <gaoxiang25@huawei.com>
		*/
		#include "internal.h"
		#include <linux/prefetch.h>
		@@ -315,4 +314,3 @@ const struct address_space_operations erofs_raw_access_aops = {
		.readahead = erofs_raw_access_readahead,
		.bmap = erofs_bmap,
		};

fs/erofs/decompressor.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -2,7 +2,6 @@
		/*
		* Copyright (C) 2019 HUAWEI, Inc.
		* https://www.huawei.com/
		* Created by Gao Xiang <gaoxiang25@huawei.com>
		*/
		#include "compress.h"
		#include <linux/module.h>
		@@ -407,4 +406,3 @@ int z_erofs_decompress(struct z_erofs_decompress_req *rq,
		return z_erofs_shifted_transform(rq, pagepool);
		return z_erofs_decompress_generic(rq, pagepool);
		}