erofs: clean up redundant comment and adjust code alignment
PATCH 1/3 erofs: clean up redundant comment and adjust code alignment
Remove some redundant comments in erofs/super.c, and avoid unncessary line breaks for cleanup.
--- fs/erofs/super.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-)
fs/erofs/super.c +4 -18
@@ -21,8 +21,7 @@static struct kmem_cache *erofs_inode_cachep__read_mostly ;struct file_system_type erofs_fs_type; -void _erofs_err (struct super_block *sb,const char *function, -const char *fmt, ...) +void _erofs_err (struct super_block *sb,const char *func,const char *fmt, ...) {struct va_format vaf;va_list args;
@@ -32,12 +31,11 @@ void _erofs_err(struct super_block *sb, const char *function, vaf.fmt = fmt; vaf.va = &args; -pr_err ("(device %s): %s: %pV" , sb->s_id, function, &vaf); +pr_err ("(device %s): %s: %pV" , sb->s_id, func, &vaf);va_end (args); } -void _erofs_info (struct super_block *sb,const char *function, -const char *fmt, ...) +void _erofs_info (struct super_block *sb,const char *func,const char *fmt, ...) {struct va_format vaf;va_list args;
@@ -102,11 +100,9 @@ static void erofs_free_inode(struct inode *inode) {struct erofs_inode *vi =EROFS_I (inode); -/* be careful of RCU symlink path */ if (inode->i_op == &erofs_fast_symlink_iops)kfree (inode->i_link);kfree (vi->xattr_shared_xattrs); -kmem_cache_free (erofs_inode_cachep, vi); }
@@ -119,8 +115,7 @@ static bool check_layout_compatibility(struct super_block *sb,/* check if current kernel meets all mandatory requirements */ if (feature & (~EROFS_ALL_FEATURE_INCOMPAT )) { -erofs_err (sb, -"unidentified incompatible feature %x, please upgrade kernel version" , +erofs_err (sb,"unidentified incompatible feature %x, please upgrade kernel" , feature & ~EROFS_ALL_FEATURE_INCOMPAT );return false; }
@@ -429,7 +424,6 @@ static int erofs_read_superblock(struct super_block *sb)return ret; } -/* set up default EROFS parameters */ static void erofs_default_options (struct erofs_fs_context *ctx) {#ifdef CONFIG_EROFS_FS_ZIP
@@ -731,7 +725,6 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc)xa_init (&sbi->managed_pslots);#endif -/* get the root inode */ inode =erofs_iget (sb,ROOT_NID (sbi));if (IS_ERR (inode))return PTR_ERR (inode);
@@ -748,7 +741,6 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc)return -ENOMEM ;erofs_shrinker_register (sb); -/* sb->s_umount is already locked, SB_ACTIVE and SB_BORN are not set */ if (erofs_sb_has_fragments (sbi) && sbi->packed_nid) { sbi->packed_inode =erofs_iget (sb, sbi->packed_nid);if (IS_ERR (sbi->packed_inode)) {
@@ -881,10 +873,6 @@ static int erofs_init_fs_context(struct fs_context *fc)return 0 ; } -/* -* could be triggered after deactivate_locked_super() -* is called, thus including umount and failed to initialize. -*/ static void erofs_kill_sb (struct super_block *sb) {struct erofs_sb_info *sbi;
@@ -913,7 +901,6 @@ static void erofs_kill_sb(struct super_block *sb) sb->s_fs_info =NULL ; } -/* called when ->s_root is non-NULL */ static void erofs_put_super (struct super_block *sb) {struct erofs_sb_info *const sbi =EROFS_SB (sb);
@@ -1007,7 +994,6 @@ static void __exit erofs_module_exit(void)erofs_pcpubuf_exit (); } -/* get filesystem statistics */ static int erofs_statfs (struct dentry *dentry,struct kstatfs *buf) {struct super_block *sb = dentry->d_sb;
Signature · 1 line
2.19.1.6.gb485710b
PATCH 2/3 erofs: add necessary kmem_cache_create flags for erofs inode cache
To improve memory access efficiency and enable statistics functionality, add SLAB_MEM_SPREAD and SLAB_ACCOUNT flag during erofs_icachep's allocation time.
--- fs/erofs/super.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/erofs/super.c +3 -3
@@ -937,9 +937,9 @@ static int __init erofs_module_init(void)erofs_check_ondisk_layout_definitions (); erofs_inode_cachep =kmem_cache_create ("erofs_inode" , -sizeof (struct erofs_inode ),0 , -SLAB_RECLAIM_ACCOUNT , - erofs_inode_init_once); +sizeof (struct erofs_inode ),0 , +SLAB_RECLAIM_ACCOUNT |SLAB_MEM_SPREAD |SLAB_ACCOUNT , + erofs_inode_init_once);if (!erofs_inode_cachep)return -ENOMEM ;
Signature · 1 line
2.19.1.6.gb485710b
Re: [PATCH 2/3] erofs: add necessary kmem_cache_create flags for erofs inode cache
Quoted 5 lines · Ferry Meng
To improve memory access efficiency and enable statistics functionality, add
SLAB_MEM_SPREADandSLAB_ACCOUNTflag during erofs_icachep's allocation time.Signed-off-by Ferry Meng <[email protected]>
Thanks,
Gao Xiang
Re: [PATCH 2/3] erofs: add necessary kmem_cache_create flags for erofs inode cache
In reply to Ferry MengQuoted 5 lines · Ferry Meng
To improve memory access efficiency and enable statistics functionality, add
SLAB_MEM_SPREADandSLAB_ACCOUNTflag during erofs_icachep's allocation time.Signed-off-by Ferry Meng <[email protected]>
Thanks,
PATCH 3/3 erofs: remove redundant erofs_fs_type declaration in super.c
In reply to Ferry MengAs erofs_fs_type has been declared in internal.h, there is no use to declare repeatedly in super.c.
--- fs/erofs/super.c | 1 - 1 file changed, 1 deletion(-)
fs/erofs/super.c +0 -1
@@ -19,7 +19,6 @@#include <trace/events/erofs.h> static struct kmem_cache *erofs_inode_cachep__read_mostly ; -struct file_system_type erofs_fs_type;void _erofs_err (struct super_block *sb,const char *func,const char *fmt, ...) {
Signature · 1 line
2.19.1.6.gb485710b
Re: [PATCH 3/3] erofs: remove redundant erofs_fs_type declaration in super.c
Quoted 4 lines · Ferry Meng
As
erofs_fs_typehas been declared ininternal.h, there is no use to declare repeatedly insuper.c.Signed-off-by Ferry Meng <[email protected]>
Thanks,
Gao Xiang
Re: [PATCH 3/3] erofs: remove redundant erofs_fs_type declaration in super.c
In reply to Ferry MengQuoted 4 lines · Ferry Meng
As
erofs_fs_typehas been declared ininternal.h, there is no use to declare repeatedly insuper.c.Signed-off-by Ferry Meng <[email protected]>
Thanks,
Quoted 4 lines · Ferry Meng
Remove some redundant comments in
erofs/super.c, and avoid unncessary line breaks for cleanup.Signed-off-by Ferry Meng <[email protected]>
Thanks,
Gao Xiang
Quoted 4 lines · Ferry Meng
Remove some redundant comments in
erofs/super.c, and avoid unncessary line breaks for cleanup.Signed-off-by Ferry Meng <[email protected]>
Thanks,
Gao Xiang
Quoted 4 lines · Ferry Meng
Remove some redundant comments in
erofs/super.c, and avoid unncessary line breaks for cleanup.Signed-off-by Ferry Meng <[email protected]>
Thanks,