staging: erofs:converting all 'unsigned' to 'unsigned int'
PATCH 1/1 staging: erofs:converting all 'unsigned' to 'unsigned int'
Fixed check patch warnings: converting all 'unsigned' to 'unsigned int'
--- drivers/staging/erofs/internal.h | 7 ++++--- drivers/staging/erofs/unzip_pagevec.h | 11 ++++++----- drivers/staging/erofs/unzip_vle.h | 8 ++++---- drivers/staging/erofs/xattr.h | 11 ++++++----- 4 files changed, 20 insertions(+), 17 deletions(-)
drivers/staging/erofs/internal.h +4 -3
@@ -359,8 +359,8 @@ struct erofs_vnode {unsigned char inode_isize;unsigned short xattr_isize; -unsigned xattr_shared_count; -unsigned *xattr_shared_xattrs; +unsigned int xattr_shared_count; +unsigned int *xattr_shared_xattrs;union {erofs_blk_t raw_blkaddr;
@@ -510,7 +510,8 @@ erofs_grab_bio(struct super_block *sb,return bio; } -static inline void __submit_bio (struct bio *bio,unsigned op,unsigned op_flags) +static inline void __submit_bio (struct bio *bio,unsigned int op, +unsigned int op_flags) {bio_set_op_attrs (bio, op, op_flags);submit_bio (bio);
drivers/staging/erofs/unzip_pagevec.h +6 -5
@@ -54,9 +54,9 @@ static inline void z_erofs_pagevec_ctor_exit(struct z_erofs_pagevec_ctor *ctor,static inline struct page *z_erofs_pagevec_ctor_next_page (struct z_erofs_pagevec_ctor *ctor, -unsigned nr) +unsigned int nr) { -unsigned index; +unsigned int index;/* keep away from occupied pages */ if (ctor->next)
@@ -64,7 +64,7 @@ z_erofs_pagevec_ctor_next_page(struct z_erofs_pagevec_ctor *ctor,for (index =0 ; index < nr; ++index) {const erofs_vtptr_t t = ctor->pages[index]; -const unsigned tags =tagptr_unfold_tags (t); +const unsigned int tags =tagptr_unfold_tags (t);if (tags ==Z_EROFS_PAGE_TYPE_EXCLUSIVE )return tagptr_unfold_ptr (t);
@@ -91,8 +91,9 @@ z_erofs_pagevec_ctor_pagedown(struct z_erofs_pagevec_ctor *ctor, }static inline void z_erofs_pagevec_ctor_init (struct z_erofs_pagevec_ctor *ctor, -unsigned nr, -erofs_vtptr_t *pages,unsigned i) +unsigned int nr, +erofs_vtptr_t *pages, +unsigned int i) { ctor->nr = nr; ctor->curr = ctor->next =NULL ;
drivers/staging/erofs/unzip_vle.h +4 -4
@@ -34,7 +34,7 @@ struct z_erofs_vle_work {unsigned short nr_pages;/* L: queued pages in pagevec[] */ -unsigned vcnt; +unsigned int vcnt;union {/* L: pagevec */
@@ -124,7 +124,7 @@ union z_erofs_onlinepage_converter {unsigned long *v; }; -static inline unsigned z_erofs_onlinepage_index (struct page *page) +static inline unsigned int z_erofs_onlinepage_index (struct page *page) {union z_erofs_onlinepage_converter u;
@@ -164,7 +164,7 @@ static inline void z_erofs_onlinepage_fixup(struct page *page, } v = (index <<Z_EROFS_ONLINEPAGE_INDEX_SHIFT ) | - ((o &Z_EROFS_ONLINEPAGE_COUNT_MASK ) + (unsigned )down); + ((o &Z_EROFS_ONLINEPAGE_COUNT_MASK ) + (unsigned int )down);if (cmpxchg (p, o, v) != o) goto repeat; }
@@ -172,7 +172,7 @@ static inline void z_erofs_onlinepage_fixup(struct page *page,static inline void z_erofs_onlinepage_endio (struct page *page) {union z_erofs_onlinepage_converter u; -unsigned v; +unsigned int v;DBG_BUGON (!PagePrivate (page)); u.v = &page_private (page);
drivers/staging/erofs/xattr.h +6 -5
@@ -20,14 +20,14 @@/* Attribute not found */ #define ENOATTR ENODATA -static inline unsigned inlinexattr_header_size (struct inode *inode) +static inline unsigned int inlinexattr_header_size (struct inode *inode) {return sizeof (struct erofs_xattr_ibody_header ) +sizeof (u32) *EROFS_V (inode)->xattr_shared_count; }static inline erofs_blk_t -xattrblock_addr (struct erofs_sb_info *sbi,unsigned xattr_id) +xattrblock_addr (struct erofs_sb_info *sbi,unsigned int xattr_id) {#ifdef CONFIG_EROFS_FS_XATTR return sbi->xattr_blkaddr +
@@ -37,8 +37,8 @@ xattrblock_addr(struct erofs_sb_info *sbi, unsigned xattr_id)#endif } -static inline unsigned -xattrblock_offset (struct erofs_sb_info *sbi,unsigned xattr_id) +static inline unsigned int +xattrblock_offset (struct erofs_sb_info *sbi,unsigned int xattr_id) {return (xattr_id *sizeof (__u32)) %EROFS_BLKSIZ ; }
@@ -49,7 +49,8 @@ extern const struct xattr_handler erofs_xattr_trusted_handler;extern const struct xattr_handler erofs_xattr_security_handler;#endif -static inline const struct xattr_handler *erofs_xattr_handler (unsigned index) +static inline const struct xattr_handler *erofs_xattr_handler ( +unsigned int index) {static const struct xattr_handler *xattr_handler_map[] = { [EROFS_XATTR_INDEX_USER ] = &erofs_xattr_user_handler,
Signature · 1 line
2.9.3
PATCH 1/1 staging: erofs:converting all 'unsigned' to 'unsigned int'
Quoted 3 lines · Pratik Shinde
Fixed check patch warnings: converting all 'unsigned' to 'unsigned int'
Signed-off-by Pratik Shinde <pratikshinde320 at gmail.com>
The subject line should be better as "[PATCH v2] staging: erofs:converting all 'unsigned' to 'unsigned int'"
Quoted 131 lines
--- drivers/staging/erofs/internal.h | 7 ++++--- drivers/staging/erofs/unzip_pagevec.h | 11 ++++++----- drivers/staging/erofs/unzip_vle.h | 8 ++++---- drivers/staging/erofs/xattr.h | 11 ++++++----- 4 files changed, 20 insertions(+), 17 deletions(-)drivers/staging/erofs/internal.h +4
-3@@ -359,8 +359,8 @@ struct erofs_vnode {unsigned char inode_isize;unsigned short xattr_isize; -unsigned xattr_shared_count; -unsigned *xattr_shared_xattrs; +unsigned int xattr_shared_count; +unsigned int *xattr_shared_xattrs;union {erofs_blk_t raw_blkaddr;@@ -510,7 +510,8 @@ erofs_grab_bio(struct super_block *sb,return bio; } -static inline void __submit_bio (struct bio *bio,unsigned op,unsigned op_flags) +static inline void __submit_bio (struct bio *bio,unsigned int op, +unsigned int op_flags) {bio_set_op_attrs (bio, op, op_flags);submit_bio (bio);drivers/staging/erofs/unzip_pagevec.h +6
-5@@ -54,9 +54,9 @@ static inline void z_erofs_pagevec_ctor_exit(struct z_erofs_pagevec_ctor *ctor,static inline struct page *z_erofs_pagevec_ctor_next_page (struct z_erofs_pagevec_ctor *ctor, -unsigned nr) +unsigned int nr) { -unsigned index; +unsigned int index;/* keep away from occupied pages */ if (ctor->next)@@ -64,7 +64,7 @@ z_erofs_pagevec_ctor_next_page(struct z_erofs_pagevec_ctor *ctor,for (index =0 ; index < nr; ++index) {const erofs_vtptr_t t = ctor->pages[index]; -const unsigned tags =tagptr_unfold_tags (t); +const unsigned int tags =tagptr_unfold_tags (t);if (tags ==Z_EROFS_PAGE_TYPE_EXCLUSIVE )return tagptr_unfold_ptr (t);@@ -91,8 +91,9 @@ z_erofs_pagevec_ctor_pagedown(struct z_erofs_pagevec_ctor *ctor, }static inline void z_erofs_pagevec_ctor_init (struct z_erofs_pagevec_ctor *ctor, -unsigned nr, -erofs_vtptr_t *pages,unsigned i) +unsigned int nr, +erofs_vtptr_t *pages, +unsigned int i) { ctor->nr = nr; ctor->curr = ctor->next =NULL ;drivers/staging/erofs/unzip_vle.h +4
-4@@ -34,7 +34,7 @@ struct z_erofs_vle_work {unsigned short nr_pages;/* L: queued pages in pagevec[] */ -unsigned vcnt; +unsigned int vcnt;union {/* L: pagevec */ @@ -124,7 +124,7 @@ union z_erofs_onlinepage_converter {unsigned long *v; }; -static inline unsigned z_erofs_onlinepage_index (struct page *page) +static inline unsigned int z_erofs_onlinepage_index (struct page *page) {union z_erofs_onlinepage_converter u;@@ -164,7 +164,7 @@ static inline void z_erofs_onlinepage_fixup(struct page *page, } v = (index <<Z_EROFS_ONLINEPAGE_INDEX_SHIFT ) | - ((o &Z_EROFS_ONLINEPAGE_COUNT_MASK ) + (unsigned )down); + ((o &Z_EROFS_ONLINEPAGE_COUNT_MASK ) + (unsigned int )down);if (cmpxchg (p, o, v) != o) goto repeat; }@@ -172,7 +172,7 @@ static inline void z_erofs_onlinepage_fixup(struct page *page,static inline void z_erofs_onlinepage_endio (struct page *page) {union z_erofs_onlinepage_converter u; -unsigned v; +unsigned int v;DBG_BUGON (!PagePrivate (page)); u.v = &page_private (page);drivers/staging/erofs/xattr.h +2
-2@@ -20,14 +20,14 @@/* Attribute not found */ #define ENOATTR ENODATA -static inline unsigned inlinexattr_header_size (struct inode *inode) +static inline unsigned int inlinexattr_header_size (struct inode *inode) {return sizeof (struct erofs_xattr_ibody_header ) +sizeof (u32) *EROFS_V (inode)->xattr_shared_count; }static inline erofs_blk_t -xattrblock_addr (struct erofs_sb_info *sbi,unsigned xattr_id) +xattrblock_addr (struct erofs_sb_info *sbi,unsigned int xattr_id) {#ifdef CONFIG_EROFS_FS_XATTR return sbi->xattr_blkaddr +
drivers/staging/erofs/xattr.h xattrblock_addr(struct erofs_sb_info *sbi, unsigned xattr_id) · line 41
Quoted 7 lines
drivers/staging/erofs/xattr.h +2
-2@@ -37,8 +37,8 @@ xattrblock_addr(struct erofs_sb_info *sbi, unsigned xattr_id)#endif } -static inline unsigned -xattrblock_offset (struct erofs_sb_info *sbi,unsigned xattr_id) +static inline unsigned int +xattrblock_offset (struct erofs_sb_info *sbi,unsigned int xattr_id)
How about..
36 static inline unsigned int xattrblock_offset(struct erofs_sb_info *sbi,
37 unsigned int xattr_id)
drivers/staging/erofs/xattr.h extern const struct xattr_handler erofs_xattr_trusted_handler; · line 53
Quoted 10 lines
drivers/staging/erofs/xattr.h +2
-1{return (xattr_id *sizeof (__u32)) %EROFS_BLKSIZ ; }@@ -49,7 +49,8 @@ extern const struct xattr_handler erofs_xattr_trusted_handler;extern const struct xattr_handler erofs_xattr_security_handler;#endif -static inline const struct xattr_handler *erofs_xattr_handler (unsigned index) +static inline const struct xattr_handler *erofs_xattr_handler ( +unsigned int index)
How about
static inline const struct xattr_handler *erofs_xattr_handler(unsigned int idx)
since the above line is somewhat odd....
Thanks,
Gao Xiang
Quoted 4 lines
drivers/staging/erofs/xattr.h +0
-0{static const struct xattr_handler *xattr_handler_map[] = { [EROFS_XATTR_INDEX_USER ] = &erofs_xattr_user_handler,