staging: erofs: fix parenthesis alignment
PATCH 1/1 staging: erofs: fix parenthesis alignment
Fix all checkpatch issues: "CHECK: Alignment should match open parenthesis"
--- drivers/staging/erofs/inode.c | 13 +++---- drivers/staging/erofs/namei.c | 3 +- drivers/staging/erofs/super.c | 26 +++++++------- drivers/staging/erofs/unzip_vle.c | 57 ++++++++++++++++--------------- drivers/staging/erofs/utils.c | 2 +- drivers/staging/erofs/xattr.c | 35 ++++++++++--------- 6 files changed, 73 insertions(+), 63 deletions(-)
drivers/staging/erofs/inode.c +7 -6
@@ -25,7 +25,7 @@ static int read_inode(struct inode *inode, void *data)if (unlikely (vi->data_mapping_mode >=EROFS_INODE_LAYOUT_MAX )) {errln ("unknown data mapping mode %u of nid %llu" , - vi->data_mapping_mode, vi->nid); + vi->data_mapping_mode, vi->nid);DBG_BUGON (1 );return -EIO ; }
@@ -38,7 +38,7 @@ static int read_inode(struct inode *inode, void *data) inode->i_mode =le16_to_cpu (v2->i_mode);if (S_ISREG (inode->i_mode) ||S_ISDIR (inode->i_mode) || -S_ISLNK (inode->i_mode)) { +S_ISLNK (inode->i_mode)) { vi->raw_blkaddr =le32_to_cpu (v2->i_u.raw_blkaddr); }else if (S_ISCHR (inode->i_mode) ||S_ISBLK (inode->i_mode)) { inode->i_rdev =
@@ -68,7 +68,7 @@ static int read_inode(struct inode *inode, void *data) inode->i_mode =le16_to_cpu (v1->i_mode);if (S_ISREG (inode->i_mode) ||S_ISDIR (inode->i_mode) || -S_ISLNK (inode->i_mode)) { +S_ISLNK (inode->i_mode)) { vi->raw_blkaddr =le32_to_cpu (v1->i_u.raw_blkaddr); }else if (S_ISCHR (inode->i_mode) ||S_ISBLK (inode->i_mode)) { inode->i_rdev =
@@ -92,7 +92,7 @@ static int read_inode(struct inode *inode, void *data) inode->i_size =le32_to_cpu (v1->i_size); }else {errln ("unsupported on-disk inode version %u of nid %llu" , -__inode_version (advise), vi->nid); +__inode_version (advise), vi->nid);DBG_BUGON (1 );return -EIO ; }
@@ -173,7 +173,7 @@ static int fill_inode(struct inode *inode, int isdir)if (IS_ERR (page)) {errln ("failed to get inode (nid: %llu) page, err %ld" , - vi->nid,PTR_ERR (page)); + vi->nid,PTR_ERR (page));return PTR_ERR (page); }
@@ -260,7 +260,8 @@ static inline struct inode *erofs_iget_locked(struct super_block *sb, }struct inode *erofs_iget (struct super_block *sb, -erofs_nid_t nid,bool isdir) +erofs_nid_t nid, +bool isdir) {struct inode *inode =erofs_iget_locked (sb, nid);
drivers/staging/erofs/namei.c +2 -1
@@ -211,7 +211,8 @@ int erofs_namei(struct inode *dir,/* NOTE: i_mutex is already held by vfs */ static struct dentry *erofs_lookup (struct inode *dir, -struct dentry *dentry,unsigned int flags) +struct dentry *dentry, +unsigned int flags) {int err;erofs_nid_t nid;
drivers/staging/erofs/super.c +14 -12
@@ -32,9 +32,9 @@ static void init_once(void *ptr)static int __init erofs_init_inode_cache (void ) { - erofs_inode_cachep =kmem_cache_create ("erofs_inode" , -sizeof (struct erofs_vnode ),0 , -SLAB_RECLAIM_ACCOUNT , init_once); + erofs_inode_cachep = +kmem_cache_create ("erofs_inode" ,sizeof (struct erofs_vnode ),0 , +SLAB_RECLAIM_ACCOUNT , init_once);return erofs_inode_cachep !=NULL ?0 : -ENOMEM ; }
@@ -105,7 +105,7 @@ static int superblock_read(struct super_block *sb)/* 9(512 bytes) + LOG_SECTORS_PER_BLOCK == LOG_BLOCK_SIZE */ if (unlikely (blkszbits !=LOG_BLOCK_SIZE )) {errln ("blksize %u isn't supported on this platform" , -1 << blkszbits); +1 << blkszbits); goto out; }
@@ -121,7 +121,7 @@ static int superblock_read(struct super_block *sb)if (1 << (sbi->clusterbits -PAGE_SHIFT ) >Z_EROFS_CLUSTER_MAX_PAGES )errln ("clusterbits %u is not supported on this kernel" , - sbi->clusterbits); + sbi->clusterbits);#endif sbi->root_nid =le16_to_cpu (layout->root_nid);
@@ -132,7 +132,7 @@ static int superblock_read(struct super_block *sb)memcpy (&sb->s_uuid, layout->uuid,sizeof (layout->uuid));memcpy (sbi->volume_name, layout->volume_name, -sizeof (layout->volume_name)); +sizeof (layout->volume_name)); ret =0 ; out:
@@ -313,7 +313,8 @@ static int managed_cache_releasepage(struct page *page, gfp_t gfp_mask) }static void managed_cache_invalidatepage (struct page *page, -unsigned int offset,unsigned int length) +unsigned int offset, +unsigned int length) {const unsigned int stop = length + offset;
@@ -352,7 +353,8 @@ static struct inode *erofs_init_managed_cache(struct super_block *sb)#endif static int erofs_read_super (struct super_block *sb, -const char *dev_name,void *data,int silent) +const char *dev_name, +void *data,int silent) {struct inode *inode;struct erofs_sb_info *sbi;
@@ -424,7 +426,7 @@ static int erofs_read_super(struct super_block *sb,if (!S_ISDIR (inode->i_mode)) {errln ("rootino(nid %llu) is not a directory(i_mode %o)" , -ROOT_NID (sbi), inode->i_mode); +ROOT_NID (sbi), inode->i_mode); err = -EINVAL ;iput (inode); goto err_iget;
@@ -450,7 +452,7 @@ static int erofs_read_super(struct super_block *sb,if (!silent)infoln ("mounted on %s with opts: %s." , dev_name, - (char *)data); + (char *)data);return 0 ;/* * please add a label for each exit point and use
@@ -515,7 +517,7 @@ struct erofs_mount_private {/* support mount_bdev() with options */ static int erofs_fill_super (struct super_block *sb, -void *_priv,int silent) +void *_priv,int silent) {struct erofs_mount_private *priv = _priv;
@@ -635,7 +637,7 @@ static int erofs_show_options(struct seq_file *seq, struct dentry *root)#endif if (test_opt (sbi,FAULT_INJECTION ))seq_printf (seq,",fault_injection=%u" , -erofs_get_fault_rate (sbi)); +erofs_get_fault_rate (sbi));return 0 ; }
drivers/staging/erofs/unzip_vle.c +30 -27
153 lines not on this page · raw message
drivers/staging/erofs/utils.c +1 -1
@@ -221,7 +221,7 @@ unsigned long erofs_shrink_workstation(struct erofs_sb_info *sbi,erofs_workstn_lock (sbi); found =radix_tree_gang_lookup (&sbi->workstn_tree, - batch, first_index,PAGEVEC_SIZE ); + batch, first_index,PAGEVEC_SIZE );for (i =0 ; i < found; ++i) {struct erofs_workgroup *grp =xa_untag_pointer (batch[i]);
drivers/staging/erofs/xattr.c +19 -16
@@ -122,8 +122,9 @@ static int init_inode_xattrs(struct inode *inode)BUG_ON (it.ofs !=EROFS_BLKSIZ );xattr_iter_end (&it, atomic_map); - it.page =erofs_get_meta_page (sb, - ++it.blkaddr,S_ISDIR (inode->i_mode)); + it.page = +erofs_get_meta_page (sb, ++it.blkaddr, +S_ISDIR (inode->i_mode));if (IS_ERR (it.page)) {kfree (vi->xattr_shared_xattrs); vi->xattr_shared_xattrs =NULL ;
@@ -187,7 +188,7 @@ static inline int xattr_iter_fixup(struct xattr_iter *it) }static int inline_xattr_iter_begin (struct xattr_iter *it, -struct inode *inode) +struct inode *inode) {struct erofs_vnode *const vi =EROFS_V (inode);struct erofs_sb_info *const sbi =EROFS_SB (inode->i_sb);
@@ -217,7 +218,8 @@ static int inline_xattr_iter_begin(struct xattr_iter *it,* `ofs' pointing to the next xattr item rather than an arbitrary position. */ static int xattr_foreach (struct xattr_iter *it, -const struct xattr_iter_handlers *op,unsigned int *tlimit) +const struct xattr_iter_handlers *op, +unsigned int *tlimit) {struct erofs_xattr_entry entry;unsigned int value_sz, processed, slice;
@@ -321,7 +323,7 @@ struct getxattr_iter { };static int xattr_entrymatch (struct xattr_iter *_it, -struct erofs_xattr_entry *entry) +struct erofs_xattr_entry *entry) { struct getxattr_iter *it = container_of(_it, struct getxattr_iter, it);
@@ -330,7 +332,7 @@ static int xattr_entrymatch(struct xattr_iter *_it, }static int xattr_namematch (struct xattr_iter *_it, -unsigned int processed,char *buf,unsigned int len) +unsigned int processed,char *buf,unsigned int len) { struct getxattr_iter *it = container_of(_it, struct getxattr_iter, it);
@@ -338,7 +340,7 @@ static int xattr_namematch(struct xattr_iter *_it, }static int xattr_checkbuffer (struct xattr_iter *_it, -unsigned int value_sz) +unsigned int value_sz) { struct getxattr_iter *it = container_of(_it, struct getxattr_iter, it);int err = it->buffer_size < value_sz ? -ERANGE :0 ;
@@ -348,7 +350,8 @@ static int xattr_checkbuffer(struct xattr_iter *_it, }static void xattr_copyvalue (struct xattr_iter *_it, -unsigned int processed,char *buf,unsigned int len) +unsigned int processed, +char *buf,unsigned int len) { struct getxattr_iter *it = container_of(_it, struct getxattr_iter, it);
@@ -429,8 +432,8 @@ static bool erofs_xattr_trusted_list(struct dentry *dentry) }int erofs_getxattr (struct inode *inode,int index, -const char *name, -void *buffer,size_t buffer_size) +const char *name, +void *buffer,size_t buffer_size) {int ret;struct getxattr_iter it;
@@ -460,8 +463,8 @@ int erofs_getxattr(struct inode *inode, int index, }static int erofs_xattr_generic_get (const struct xattr_handler *handler, -struct dentry *unused,struct inode *inode, -const char *name,void *buffer,size_t size) +struct dentry *unused,struct inode *inode, +const char *name,void *buffer,size_t size) {struct erofs_sb_info *const sbi =EROFS_I_SB (inode);
@@ -527,7 +530,7 @@ struct listxattr_iter { };static int xattr_entrylist (struct xattr_iter *_it, -struct erofs_xattr_entry *entry) +struct erofs_xattr_entry *entry) {struct listxattr_iter *it = container_of(_it, struct listxattr_iter, it);
@@ -558,7 +561,7 @@ static int xattr_entrylist(struct xattr_iter *_it, }static int xattr_namelist (struct xattr_iter *_it, -unsigned int processed,char *buf,unsigned int len) +unsigned int processed,char *buf,unsigned int len) {struct listxattr_iter *it = container_of(_it, struct listxattr_iter, it);
@@ -569,7 +572,7 @@ static int xattr_namelist(struct xattr_iter *_it, }static int xattr_skipvalue (struct xattr_iter *_it, -unsigned int value_sz) +unsigned int value_sz) {struct listxattr_iter *it = container_of(_it, struct listxattr_iter, it);
@@ -641,7 +644,7 @@ static int shared_listxattr(struct listxattr_iter *it) }ssize_t erofs_listxattr (struct dentry *dentry, -char *buffer,size_t buffer_size) +char *buffer,size_t buffer_size) {int ret;struct listxattr_iter it;
Signature · 1 line
2.17.1
PATCH 1/1 staging: erofs: fix parenthesis alignment
Hi Julian,
drivers/staging/erofs/unzip_vle.c void erofs_workgroup_free_rcu(struct erofs_workgroup *grp) · line 602
Quoted 7 lines · Julian Merida
static void __z_erofs_vle_work_release(struct
z_erofs_vle_workgroup*grp,drivers/staging/erofs/unzip_vle.c +2
-1- struct z_erofs_vle_work *work __maybe_unused) +struct z_erofs_vle_work + *work __maybe_unused) {erofs_workgroup_put (&grp->obj); }
probably the following be better?
static void
__z_erofs_vle_work_release(struct z_erofs_vle_workgroup *grp,
struct z_erofs_vle_work *work __maybe_unused)
{
erofs_workgroup_put(&grp->obj);
}could you please fix that?
Thanks,
Gao Xiang
PATCH 1/1 staging: erofs: fix parenthesis alignment
In reply to Julian Meridadrivers/staging/erofs/unzip_vle.c static int z_erofs_do_read_page(struct z_erofs_vle_frontend *fe, · line 787
Quoted 5 lines · Julian Merida
drivers/staging/erofs/unzip_vle.c +3
-2- err =z_erofs_vle_work_add_page (builder, - newpage,Z_EROFS_PAGE_TYPE_EXCLUSIVE ); + err = +z_erofs_vle_work_add_page (builder, newpage, +Z_EROFS_PAGE_TYPE_EXCLUSIVE );
Why not ?
err = z_erofs_vle_work_add_page(builder, newpage, Z_EROFS_PAGE_TYPE_EXCLUSIVE);
PATCH 1/1 staging: erofs: fix parenthesis alignment
Sorry for the delay, I've been busy and I couldn't check the code before. Sorry for those mistakes, I agree. That is how the should be. I am going to edit them and resend the patch to you.
Regards, Julian Merida
El mar., 12 de mar. de 2019 a la(s) 02:37, Gao Xiang (gaoxiang25 at huawei.com) escribi?:
Quoted 9 lines · Julian Merida
drivers/staging/erofs/unzip_vle.c static int z_erofs_do_read_page(struct z_erofs_vle_frontend *fe, · line 787
Quoted 5 lines
drivers/staging/erofs/unzip_vle.c +3
-2- err =z_erofs_vle_work_add_page (builder, - newpage,Z_EROFS_PAGE_TYPE_EXCLUSIVE ); + err = +z_erofs_vle_work_add_page (builder, newpage, +Z_EROFS_PAGE_TYPE_EXCLUSIVE );
Quoted 5 lines
Why not ?
err = z_erofs_vle_work_add_page(builder, newpage,
Z_EROFS_PAGE_TYPE_EXCLUSIVE);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ozlabs.org/pipermail/linux-erofs/attachments/20190317/ce3bc037/attachment.htm>