Skip to content

L
linux
Commit 7aed4d57 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

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
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 42 deletions
MAINTAINERS
View file @ 7aed4d57
...@@ -6786,7 +6786,7 @@ F: include/video/s1d13xxxfb.h ...@@ -6786,7 +6786,7 @@ F: include/video/s1d13xxxfb.h
EROFS FILE SYSTEM EROFS FILE SYSTEM
M: Gao Xiang <xiang@kernel.org> M: Gao Xiang <xiang@kernel.org>
M: Chao Yu <yuchao0@huawei.com> M: Chao Yu <chao@kernel.org>
L: linux-erofs@lists.ozlabs.org L: linux-erofs@lists.ozlabs.org
S: Maintained S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git
......
fs/erofs/Kconfig
View file @ 7aed4d57
...@@ -75,4 +75,3 @@ config EROFS_FS_ZIP ...@@ -75,4 +75,3 @@ config EROFS_FS_ZIP
Enable fixed-sized output compression for EROFS. Enable fixed-sized output compression for EROFS.
If you don't want to enable compression feature, say N. If you don't want to enable compression feature, say N.
fs/erofs/compress.h
View file @ 7aed4d57
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
/* /*
* Copyright (C) 2019 HUAWEI, Inc. * Copyright (C) 2019 HUAWEI, Inc.
* https://www.huawei.com/ * https://www.huawei.com/
* Created by Gao Xiang <gaoxiang25@huawei.com>
*/ */
#ifndef __EROFS_FS_COMPRESS_H #ifndef __EROFS_FS_COMPRESS_H
#define __EROFS_FS_COMPRESS_H #define __EROFS_FS_COMPRESS_H
...@@ -85,4 +84,3 @@ int z_erofs_decompress(struct z_erofs_decompress_req *rq, ...@@ -85,4 +84,3 @@ int z_erofs_decompress(struct z_erofs_decompress_req *rq,
struct list_head *pagepool); struct list_head *pagepool);
#endif #endif
fs/erofs/data.c
View file @ 7aed4d57
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
/* /*
* Copyright (C) 2017-2018 HUAWEI, Inc. * Copyright (C) 2017-2018 HUAWEI, Inc.
* https://www.huawei.com/ * https://www.huawei.com/
* Created by Gao Xiang <gaoxiang25@huawei.com>
*/ */
#include "internal.h" #include "internal.h"
#include <linux/prefetch.h> #include <linux/prefetch.h>
...@@ -315,4 +314,3 @@ const struct address_space_operations erofs_raw_access_aops = { ...@@ -315,4 +314,3 @@ const struct address_space_operations erofs_raw_access_aops = {
.readahead = erofs_raw_access_readahead, .readahead = erofs_raw_access_readahead,
.bmap = erofs_bmap, .bmap = erofs_bmap,
}; };
fs/erofs/decompressor.c
View file @ 7aed4d57
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
/* /*
* Copyright (C) 2019 HUAWEI, Inc. * Copyright (C) 2019 HUAWEI, Inc.
* https://www.huawei.com/ * https://www.huawei.com/
* Created by Gao Xiang <gaoxiang25@huawei.com>
*/ */
#include "compress.h" #include "compress.h"
#include <linux/module.h> #include <linux/module.h>
...@@ -407,4 +406,3 @@ int z_erofs_decompress(struct z_erofs_decompress_req *rq, ...@@ -407,4 +406,3 @@ int z_erofs_decompress(struct z_erofs_decompress_req *rq,
return z_erofs_shifted_transform(rq, pagepool); return z_erofs_shifted_transform(rq, pagepool);
return z_erofs_decompress_generic(rq, pagepool); return z_erofs_decompress_generic(rq, pagepool);
} }
fs/erofs/dir.c
View file @ 7aed4d57
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
/* /*
* Copyright (C) 2017-2018 HUAWEI, Inc. * Copyright (C) 2017-2018 HUAWEI, Inc.
* https://www.huawei.com/ * https://www.huawei.com/
* Created by Gao Xiang <gaoxiang25@huawei.com>
*/ */
#include "internal.h" #include "internal.h"
...@@ -139,4 +138,3 @@ const struct file_operations erofs_dir_fops = { ...@@ -139,4 +138,3 @@ const struct file_operations erofs_dir_fops = {
.read = generic_read_dir, .read = generic_read_dir,
.iterate_shared = erofs_readdir, .iterate_shared = erofs_readdir,
}; };
fs/erofs/erofs_fs.h
View file @ 7aed4d57
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
* *
* Copyright (C) 2017-2018 HUAWEI, Inc. * Copyright (C) 2017-2018 HUAWEI, Inc.
* https://www.huawei.com/ * https://www.huawei.com/
* Created by Gao Xiang <gaoxiang25@huawei.com>
*/ */
#ifndef __EROFS_FS_H #ifndef __EROFS_FS_H
#define __EROFS_FS_H #define __EROFS_FS_H
...@@ -348,4 +347,3 @@ static inline void erofs_check_ondisk_layout_definitions(void) ...@@ -348,4 +347,3 @@ static inline void erofs_check_ondisk_layout_definitions(void)
} }
#endif #endif
fs/erofs/inode.c
View file @ 7aed4d57
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
/* /*
* Copyright (C) 2017-2018 HUAWEI, Inc. * Copyright (C) 2017-2018 HUAWEI, Inc.
* https://www.huawei.com/ * https://www.huawei.com/
* Created by Gao Xiang <gaoxiang25@huawei.com>
*/ */
#include "xattr.h" #include "xattr.h"
...@@ -374,4 +373,3 @@ const struct inode_operations erofs_fast_symlink_iops = { ...@@ -374,4 +373,3 @@ const struct inode_operations erofs_fast_symlink_iops = {
.listxattr = erofs_listxattr, .listxattr = erofs_listxattr,
.get_acl = erofs_get_acl, .get_acl = erofs_get_acl,
}; };
fs/erofs/internal.h
View file @ 7aed4d57
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
/* /*
* Copyright (C) 2017-2018 HUAWEI, Inc. * Copyright (C) 2017-2018 HUAWEI, Inc.
* https://www.huawei.com/ * https://www.huawei.com/
* Created by Gao Xiang <gaoxiang25@huawei.com>
*/ */
#ifndef __EROFS_INTERNAL_H #ifndef __EROFS_INTERNAL_H
#define __EROFS_INTERNAL_H #define __EROFS_INTERNAL_H
...@@ -469,4 +468,3 @@ static inline int z_erofs_load_lz4_config(struct super_block *sb, ...@@ -469,4 +468,3 @@ static inline int z_erofs_load_lz4_config(struct super_block *sb,
#define EFSCORRUPTED EUCLEAN /* Filesystem is corrupted */ #define EFSCORRUPTED EUCLEAN /* Filesystem is corrupted */
#endif /* __EROFS_INTERNAL_H */ #endif /* __EROFS_INTERNAL_H */
fs/erofs/namei.c
View file @ 7aed4d57
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
/* /*
* Copyright (C) 2017-2018 HUAWEI, Inc. * Copyright (C) 2017-2018 HUAWEI, Inc.
* https://www.huawei.com/ * https://www.huawei.com/
* Created by Gao Xiang <gaoxiang25@huawei.com>
*/ */
#include "xattr.h" #include "xattr.h"
...@@ -247,4 +246,3 @@ const struct inode_operations erofs_dir_iops = { ...@@ -247,4 +246,3 @@ const struct inode_operations erofs_dir_iops = {
.listxattr = erofs_listxattr, .listxattr = erofs_listxattr,
.get_acl = erofs_get_acl, .get_acl = erofs_get_acl,
}; };
fs/erofs/super.c
View file @ 7aed4d57
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
/* /*
* Copyright (C) 2017-2018 HUAWEI, Inc. * Copyright (C) 2017-2018 HUAWEI, Inc.
* https://www.huawei.com/ * https://www.huawei.com/
* Created by Gao Xiang <gaoxiang25@huawei.com>
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/buffer_head.h> #include <linux/buffer_head.h>
...@@ -285,6 +284,7 @@ static int erofs_read_superblock(struct super_block *sb) ...@@ -285,6 +284,7 @@ static int erofs_read_superblock(struct super_block *sb)
goto out; goto out;
} }
ret = -EINVAL;
blkszbits = dsb->blkszbits; blkszbits = dsb->blkszbits;
/* 9(512 bytes) + LOG_SECTORS_PER_BLOCK == LOG_BLOCK_SIZE */ /* 9(512 bytes) + LOG_SECTORS_PER_BLOCK == LOG_BLOCK_SIZE */
if (blkszbits != LOG_BLOCK_SIZE) { if (blkszbits != LOG_BLOCK_SIZE) {
...@@ -751,4 +751,3 @@ module_exit(erofs_module_exit); ...@@ -751,4 +751,3 @@ module_exit(erofs_module_exit);
MODULE_DESCRIPTION("Enhanced ROM File System"); MODULE_DESCRIPTION("Enhanced ROM File System");
MODULE_AUTHOR("Gao Xiang, Chao Yu, Miao Xie, CONSUMER BG, HUAWEI Inc."); MODULE_AUTHOR("Gao Xiang, Chao Yu, Miao Xie, CONSUMER BG, HUAWEI Inc.");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
fs/erofs/tagptr.h
View file @ 7aed4d57
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
/* /*
* A tagged pointer implementation * A tagged pointer implementation
*
* Copyright (C) 2018 Gao Xiang <gaoxiang25@huawei.com>
*/ */
#ifndef __EROFS_FS_TAGPTR_H #ifndef __EROFS_FS_TAGPTR_H
#define __EROFS_FS_TAGPTR_H #define __EROFS_FS_TAGPTR_H
...@@ -107,4 +105,3 @@ tagptr_init(o, cmpxchg(&ptptr->v, o.v, n.v)); }) ...@@ -107,4 +105,3 @@ tagptr_init(o, cmpxchg(&ptptr->v, o.v, n.v)); })
*ptptr; }) *ptptr; })
#endif /* __EROFS_FS_TAGPTR_H */ #endif /* __EROFS_FS_TAGPTR_H */
fs/erofs/utils.c
View file @ 7aed4d57
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
/* /*
* Copyright (C) 2018 HUAWEI, Inc. * Copyright (C) 2018 HUAWEI, Inc.
* https://www.huawei.com/ * https://www.huawei.com/
* Created by Gao Xiang <gaoxiang25@huawei.com>
*/ */
#include "internal.h" #include "internal.h"
#include <linux/pagevec.h> #include <linux/pagevec.h>
...@@ -278,4 +277,3 @@ void erofs_exit_shrinker(void) ...@@ -278,4 +277,3 @@ void erofs_exit_shrinker(void)
unregister_shrinker(&erofs_shrinker_info); unregister_shrinker(&erofs_shrinker_info);
} }
#endif /* !CONFIG_EROFS_FS_ZIP */ #endif /* !CONFIG_EROFS_FS_ZIP */
fs/erofs/xattr.c
View file @ 7aed4d57
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
/* /*
* Copyright (C) 2017-2018 HUAWEI, Inc. * Copyright (C) 2017-2018 HUAWEI, Inc.
* https://www.huawei.com/ * https://www.huawei.com/
* Created by Gao Xiang <gaoxiang25@huawei.com>
*/ */
#include <linux/security.h> #include <linux/security.h>
#include "xattr.h" #include "xattr.h"
...@@ -709,4 +708,3 @@ struct posix_acl *erofs_get_acl(struct inode *inode, int type) ...@@ -709,4 +708,3 @@ struct posix_acl *erofs_get_acl(struct inode *inode, int type)
return acl; return acl;
} }
#endif #endif
fs/erofs/xattr.h
View file @ 7aed4d57
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
/* /*
* Copyright (C) 2017-2018 HUAWEI, Inc. * Copyright (C) 2017-2018 HUAWEI, Inc.
* https://www.huawei.com/ * https://www.huawei.com/
* Created by Gao Xiang <gaoxiang25@huawei.com>
*/ */
#ifndef __EROFS_XATTR_H #ifndef __EROFS_XATTR_H
#define __EROFS_XATTR_H #define __EROFS_XATTR_H
......
fs/erofs/zdata.c
View file @ 7aed4d57
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
/* /*
* Copyright (C) 2018 HUAWEI, Inc. * Copyright (C) 2018 HUAWEI, Inc.
* https://www.huawei.com/ * https://www.huawei.com/
* Created by Gao Xiang <gaoxiang25@huawei.com>
*/ */
#include "zdata.h" #include "zdata.h"
#include "compress.h" #include "compress.h"
...@@ -380,7 +379,6 @@ static int z_erofs_attach_page(struct z_erofs_collector *clt, ...@@ -380,7 +379,6 @@ static int z_erofs_attach_page(struct z_erofs_collector *clt,
enum z_erofs_page_type type) enum z_erofs_page_type type)
{ {
int ret; int ret;
bool occupied;
/* give priority for inplaceio */ /* give priority for inplaceio */
if (clt->mode >= COLLECT_PRIMARY && if (clt->mode >= COLLECT_PRIMARY &&
...@@ -388,8 +386,7 @@ static int z_erofs_attach_page(struct z_erofs_collector *clt, ...@@ -388,8 +386,7 @@ static int z_erofs_attach_page(struct z_erofs_collector *clt,
z_erofs_try_inplace_io(clt, page)) z_erofs_try_inplace_io(clt, page))
return 0; return 0;
ret = z_erofs_pagevec_enqueue(&clt->vector, ret = z_erofs_pagevec_enqueue(&clt->vector, page, type);
page, type, &occupied);
clt->cl->vcnt += (unsigned int)ret; clt->cl->vcnt += (unsigned int)ret;
return ret ? 0 : -EAGAIN; return ret ? 0 : -EAGAIN;
...@@ -1471,4 +1468,3 @@ const struct address_space_operations z_erofs_aops = { ...@@ -1471,4 +1468,3 @@ const struct address_space_operations z_erofs_aops = {
.readpage = z_erofs_readpage, .readpage = z_erofs_readpage,
.readahead = z_erofs_readahead, .readahead = z_erofs_readahead,
}; };
fs/erofs/zdata.h
View file @ 7aed4d57
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
/* /*
* Copyright (C) 2018 HUAWEI, Inc. * Copyright (C) 2018 HUAWEI, Inc.
* https://www.huawei.com/ * https://www.huawei.com/
* Created by Gao Xiang <gaoxiang25@huawei.com>
*/ */
#ifndef __EROFS_FS_ZDATA_H #ifndef __EROFS_FS_ZDATA_H
#define __EROFS_FS_ZDATA_H #define __EROFS_FS_ZDATA_H
......
fs/erofs/zmap.c
View file @ 7aed4d57
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
/* /*
* Copyright (C) 2018-2019 HUAWEI, Inc. * Copyright (C) 2018-2019 HUAWEI, Inc.
* https://www.huawei.com/ * https://www.huawei.com/
* Created by Gao Xiang <gaoxiang25@huawei.com>
*/ */
#include "internal.h" #include "internal.h"
#include <asm/unaligned.h> #include <asm/unaligned.h>
...@@ -597,4 +596,3 @@ int z_erofs_map_blocks_iter(struct inode *inode, ...@@ -597,4 +596,3 @@ int z_erofs_map_blocks_iter(struct inode *inode,
DBG_BUGON(err < 0 && err != -ENOMEM); DBG_BUGON(err < 0 && err != -ENOMEM);
return err; return err;
} }
fs/erofs/zpvec.h
View file @ 7aed4d57
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
/* /*
* Copyright (C) 2018 HUAWEI, Inc. * Copyright (C) 2018 HUAWEI, Inc.
* https://www.huawei.com/ * https://www.huawei.com/
* Created by Gao Xiang <gaoxiang25@huawei.com>
*/ */
#ifndef __EROFS_FS_ZPVEC_H #ifndef __EROFS_FS_ZPVEC_H
#define __EROFS_FS_ZPVEC_H #define __EROFS_FS_ZPVEC_H
...@@ -107,10 +106,8 @@ static inline void z_erofs_pagevec_ctor_init(struct z_erofs_pagevec_ctor *ctor, ...@@ -107,10 +106,8 @@ static inline void z_erofs_pagevec_ctor_init(struct z_erofs_pagevec_ctor *ctor,
static inline bool z_erofs_pagevec_enqueue(struct z_erofs_pagevec_ctor *ctor, static inline bool z_erofs_pagevec_enqueue(struct z_erofs_pagevec_ctor *ctor,
struct page *page, struct page *page,
enum z_erofs_page_type type, enum z_erofs_page_type type)
bool *occupied)
{ {
*occupied = false;
if (!ctor->next && type) if (!ctor->next && type)
if (ctor->index + 1 == ctor->nr) if (ctor->index + 1 == ctor->nr)
return false; return false;
...@@ -125,7 +122,6 @@ static inline bool z_erofs_pagevec_enqueue(struct z_erofs_pagevec_ctor *ctor, ...@@ -125,7 +122,6 @@ static inline bool z_erofs_pagevec_enqueue(struct z_erofs_pagevec_ctor *ctor,
/* should remind that collector->next never equal to 1, 2 */ /* should remind that collector->next never equal to 1, 2 */
if (type == (uintptr_t)ctor->next) { if (type == (uintptr_t)ctor->next) {
ctor->next = page; ctor->next = page;
*occupied = true;
} }
ctor->pages[ctor->index++] = tagptr_fold(erofs_vtptr_t, page, type); ctor->pages[ctor->index++] = tagptr_fold(erofs_vtptr_t, page, type);
return true; return true;
...@@ -154,4 +150,3 @@ z_erofs_pagevec_dequeue(struct z_erofs_pagevec_ctor *ctor, ...@@ -154,4 +150,3 @@ z_erofs_pagevec_dequeue(struct z_erofs_pagevec_ctor *ctor,
return tagptr_unfold_ptr(t); return tagptr_unfold_ptr(t);
} }
#endif #endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7