Skip to contentSkip to conversation

Staging: erofs:converting all 'unsigned' to 'unsigned int'

PATCH New Pratik Shinde 2 participants 3 messages Jul 14, 2019 – Jul 15, 2019 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Staging: erofs:converting all 'unsigned' to 'unsigned int'

Fixing checkpath warnings : converting all 'unsigned' to 'unsigned int'

Signed-off-by Pratik Shinde <pratikshinde320 at gmail.com>
---
 drivers/staging/erofs/internal.h      |  6 +++---
 drivers/staging/erofs/unzip_pagevec.h | 10 +++++-----
 drivers/staging/erofs/unzip_vle.h     |  8 ++++----
 drivers/staging/erofs/xattr.h         | 10 +++++-----
 4 files changed, 17 insertions(+), 17 deletions(-)
drivers/staging/erofs/internal.h +3 -3
index 963cc1b..daae90b 100644
@@ -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,7 @@ 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 +5 -5
index 7af0ba8..198b556 100644
@@ -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,8 @@ 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
index ab509d75..df91ad1 100644
@@ -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 +5 -5
index 35ba5ac..2fc9b43 100644
@@ -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,7 @@ 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
#1 lore raw

PATCH 1/1 Staging: erofs:converting all 'unsigned' to 'unsigned int'

Hi Pratik,

Quoted 26 lines · Pratik Shinde

Fixing checkpath warnings : converting all 'unsigned' to 'unsigned int'

Signed-off-by Pratik Shinde <pratikshinde320 at gmail.com>
---
 drivers/staging/erofs/internal.h      |  6 +++---
 drivers/staging/erofs/unzip_pagevec.h | 10 +++++-----
 drivers/staging/erofs/unzip_vle.h     |  8 ++++----
 drivers/staging/erofs/xattr.h         | 10 +++++-----
 4 files changed, 17 insertions(+), 17 deletions(-)
drivers/staging/erofs/internal.h +2 -2
index 963cc1b..daae90b 100644
@@ -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;

drivers/staging/erofs/internal.h erofs_grab_bio(struct super_block *sb, · line 513

Quoted 5 lines
drivers/staging/erofs/internal.h +1 -1
@@ -510,7 +510,7 @@ 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)

The subject line could be better as "staging: erofs: converting all 'unsigned' to 'unsigned int' " and three new checkpatch warnings occurs after this patch...

WARNING: line over 80 characters
#86: FILE: drivers/staging/erofs/internal.h:513:
+static inline void __submit_bio(struct bio *bio, unsigned int op, unsigned int op_flags)

WARNING: line over 80 characters
#122: FILE: drivers/staging/erofs/unzip_pagevec.h:95:
+ erofs_vtptr_t *pages, unsigned int i)

WARNING: line over 80 characters
#203: FILE: drivers/staging/erofs/xattr.h:52:
+static inline const struct xattr_handler *erofs_xattr_handler(unsigned int index)

Thanks,
Gao Xiang

Quoted 121 lines
drivers/staging/erofs/internal.h +0 -0
 {
 	bio_set_op_attrs(bio, op, op_flags);
 	submit_bio(bio);
drivers/staging/erofs/unzip_pagevec.h +5 -5
index 7af0ba8..198b556 100644
@@ -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,8 @@ 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
index ab509d75..df91ad1 100644
@@ -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 +5 -5
index 35ba5ac..2fc9b43 100644
@@ -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,7 @@ 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,
#2 lore raw

PATCH 1/1 Staging: erofs:converting all 'unsigned' to 'unsigned int'

Hi Gao,

I will rework the patch.
Will take care of the patch subject & '80 characters line limit'

Thanks,
Pratik.

Quoted 186 lines · Gao Xiang

Hi Pratik,

Review

Quoted 11 lines · Pratik Shinde

Fixing checkpath warnings : converting all 'unsigned' to 'unsigned int'

Signed-off-by Pratik Shinde <pratikshinde320 at gmail.com>
---
 drivers/staging/erofs/internal.h      |  6 +++---
 drivers/staging/erofs/unzip_pagevec.h | 10 +++++-----
 drivers/staging/erofs/unzip_vle.h     |  8 ++++----
 drivers/staging/erofs/xattr.h         | 10 +++++-----
 4 files changed, 17 insertions(+), 17 deletions(-)
(quoted diff) +0 -0

b/drivers/staging/erofs/internal.h

Quoted 15 lines

index 963cc1b..daae90b 100644

drivers/staging/erofs/internal.h +2 -2
@@ -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;

drivers/staging/erofs/internal.h erofs_grab_bio(struct super_block *sb, · line 513

Quoted 4 lines
drivers/staging/erofs/internal.h +0 -1
@@ -510,7 +510,7 @@ erofs_grab_bio(struct super_block *sb,
      return bio;
 }
 
-static inline void __submit_bio(struct bio *bio, unsigned op, unsigned

op_flags)

drivers/staging/erofs/internal.h erofs_grab_bio(struct super_block *sb, · line 513

Quoted 1 line
drivers/staging/erofs/internal.h +1 -0
+static inline void __submit_bio(struct bio *bio, unsigned int op,

unsigned int op_flags)

The subject line could be better as "staging: erofs: converting all 'unsigned' to 'unsigned int' "
and three new checkpatch warnings occurs after this patch...

WARNING: line over 80 characters
#86: FILE: drivers/staging/erofs/internal.h:513:
+static inline void __submit_bio(struct bio *bio, unsigned int op, unsigned int op_flags)

WARNING: line over 80 characters
#122: FILE: drivers/staging/erofs/unzip_pagevec.h:95:
+ erofs_vtptr_t *pages,
unsigned int i)

WARNING: line over 80 characters
#203: FILE: drivers/staging/erofs/xattr.h:52:
+static inline const struct xattr_handler *erofs_xattr_handler(unsigned int index)

Thanks,
Gao Xiang

Review

Quoted 4 lines
drivers/staging/erofs/internal.h +0 -0
 {
      bio_set_op_attrs(bio, op, op_flags);
      submit_bio(bio);
(quoted diff) +0 -0

b/drivers/staging/erofs/unzip_pagevec.h

drivers/staging/erofs/unzip_pagevec.h static inline void z_erofs_pagevec_ctor_exit(struct

Quoted 4 lines

index 7af0ba8..198b556 100644

drivers/staging/erofs/unzip_pagevec.h +0 -0
@@ -54,9 +54,9 @@ static inline void z_erofs_pagevec_ctor_exit(struct

z_erofs_pagevec_ctor *ctor,

drivers/staging/erofs/unzip_pagevec.h z_erofs_pagevec_ctor_next_page(struct

Quoted 12 lines
drivers/staging/erofs/unzip_pagevec.h +2 -2
 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,

drivers/staging/erofs/unzip_pagevec.h z_erofs_pagevec_ctor_pagedown(struct

Quoted 9 lines
drivers/staging/erofs/unzip_pagevec.h +1 -1
      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,8 @@ z_erofs_pagevec_ctor_pagedown(struct

z_erofs_pagevec_ctor *ctor,

drivers/staging/erofs/unzip_pagevec.h z_erofs_pagevec_ctor_pagedown(struct · line 93

Quoted 3 lines
drivers/staging/erofs/unzip_pagevec.h +0 -0
 }
 
 static inline void z_erofs_pagevec_ctor_init(struct

z_erofs_pagevec_ctor *ctor,

drivers/staging/erofs/unzip_pagevec.h z_erofs_pagevec_ctor_pagedown(struct · line 95

Quoted 2 lines
drivers/staging/erofs/unzip_pagevec.h +0 -2
-                                          unsigned nr,
-                                          erofs_vtptr_t *pages,

unsigned i)

drivers/staging/erofs/unzip_pagevec.h z_erofs_pagevec_ctor_pagedown(struct · line 95

Quoted 2 lines
drivers/staging/erofs/unzip_pagevec.h +2 -0
+                                          unsigned int nr,
+                                          erofs_vtptr_t *pages,

unsigned int i)

Review

Quoted 4 lines
drivers/staging/erofs/unzip_pagevec.h +0 -0
 {
      ctor->nr = nr;
      ctor->curr = ctor->next = NULL;
(quoted diff) +0 -0

b/drivers/staging/erofs/unzip_vle.h

drivers/staging/erofs/unzip_vle.h static inline void z_erofs_onlinepage_fixup(struct

Quoted 22 lines

index ab509d75..df91ad1 100644

drivers/staging/erofs/unzip_vle.h +2 -2
@@ -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,

drivers/staging/erofs/unzip_vle.h static inline void z_erofs_onlinepage_fixup(struct

Quoted 9 lines
drivers/staging/erofs/unzip_vle.h +1 -1
      }
 
      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,

Review

Quoted 9 lines
drivers/staging/erofs/unzip_vle.h +1 -1
 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);
(quoted diff) +0 -0

b/drivers/staging/erofs/xattr.h

drivers/staging/erofs/xattr.h xattrblock_addr(struct erofs_sb_info *sbi, unsigned

Quoted 21 lines

index 35ba5ac..2fc9b43 100644

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 +
@@ -37,8 +37,8 @@ xattrblock_addr(struct erofs_sb_info *sbi, unsigned

xattr_id)

drivers/staging/erofs/xattr.h extern const struct xattr_handler

Quoted 11 lines
drivers/staging/erofs/xattr.h +2 -2
 #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,7 @@ extern const struct xattr_handler

erofs_xattr_trusted_handler;

Quoted 12 lines

drivers/staging/erofs/xattr.h extern const struct xattr_handler erofs_xattr_trusted_handler;

Quoted 4 lines
drivers/staging/erofs/xattr.h +0 -1
 extern const struct xattr_handler erofs_xattr_security_handler;
 #endif
 
-static inline const struct xattr_handler *erofs_xattr_handler(unsigned

index)

drivers/staging/erofs/xattr.h extern const struct xattr_handler · line 52

Quoted 1 line
drivers/staging/erofs/xattr.h +1 -0
+static inline const struct xattr_handler *erofs_xattr_handler(unsigned

int index)

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,

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ozlabs.org/pipermail/linux-erofs/attachments/20190715/0a466c4b/attachment.htm>