active_logs, inline_xattr_size, f2fs_fault_info.inject_rate in struct
f2fs_mount_info should never be negative, change its type from int to
unsigned int.
Signed-off-by: Chao Yu <c...@kernel.org>
---
fs/f2fs/f2fs.h | 12 ++++++------
fs/f2fs/inode.c | 2 +-
fs/f2fs/super.c | 8 ++++----
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 6fa900600826..85d1c92aa6c7 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -77,7 +77,7 @@ enum fault_option {
#ifdef CONFIG_F2FS_FAULT_INJECTION
struct f2fs_fault_info {
atomic_t inject_ops;
- int inject_rate;
+ unsigned int inject_rate;
unsigned int inject_type;
/* Used to account total count of injection for each type */
unsigned int inject_count[FAULT_MAX];
@@ -173,8 +173,8 @@ struct f2fs_mount_info {
block_t root_reserved_blocks; /* root reserved blocks */
kuid_t s_resuid; /* reserved blocks for uid */
kgid_t s_resgid; /* reserved blocks for gid */
- int active_logs; /* # of active logs */
- int inline_xattr_size; /* inline xattr size */
+ unsigned int active_logs; /* # of active logs */
+ unsigned int inline_xattr_size; /* inline xattr size */
#ifdef CONFIG_F2FS_FAULT_INJECTION
struct f2fs_fault_info fault_info; /* For fault injection */
#endif
@@ -498,7 +498,7 @@ static inline bool __has_cursum_space(struct f2fs_journal
*journal,
/* for inline stuff */
#define DEF_INLINE_RESERVED_SIZE 1
static inline int get_extra_isize(struct inode *inode);
-static inline int get_inline_xattr_addrs(struct inode *inode);
+static inline unsigned int get_inline_xattr_addrs(struct inode *inode);
#define MAX_INLINE_DATA(inode) (sizeof(__le32) * \
(CUR_ADDRS_PER_INODE(inode) - \
get_inline_xattr_addrs(inode) - \
@@ -890,7 +890,7 @@ struct f2fs_inode_info {
int i_extra_isize; /* size of extra space located in
i_addr */
kprojid_t i_projid; /* id for project quota */
- int i_inline_xattr_size; /* inline xattr size */
+ unsigned int i_inline_xattr_size;/* inline xattr size */
struct timespec64 i_crtime; /* inode creation time */
struct timespec64 i_disk_time[3];/* inode disk times */
@@ -3552,7 +3552,7 @@ static inline int get_extra_isize(struct inode *inode)
return F2FS_I(inode)->i_extra_isize / sizeof(__le32);
}
-static inline int get_inline_xattr_addrs(struct inode *inode)
+static inline unsigned int get_inline_xattr_addrs(struct inode *inode)
{
return F2FS_I(inode)->i_inline_xattr_size;
}
diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
index 747857a5b143..137e1458bbef 100644
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@ -321,7 +321,7 @@ static bool sanity_check_inode(struct inode *inode, struct
page *node_page)
f2fs_has_inline_xattr(inode) &&
(fi->i_inline_xattr_size < MIN_INLINE_XATTR_SIZE ||
fi->i_inline_xattr_size > MAX_INLINE_XATTR_SIZE)) {
- f2fs_warn(sbi, "%s: inode (ino=%lx) has corrupted
i_inline_xattr_size: %d, min: %zu, max: %lu",
+ f2fs_warn(sbi, "%s: inode (ino=%lx) has corrupted
i_inline_xattr_size: %u, min: %zu, max: %lu",
__func__, inode->i_ino, fi->i_inline_xattr_size,
MIN_INLINE_XATTR_SIZE, MAX_INLINE_XATTR_SIZE);
return false;
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index b86e42b43ef1..ec296d5d0fd7 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -79,10 +79,10 @@ int f2fs_build_fault_attr(struct f2fs_sb_info *sbi,
unsigned long rate,
}
if (fo & FAULT_RATE) {
- if (rate > INT_MAX)
+ if (rate > UINT_MAX)
return -EINVAL;
atomic_set(&ffi->inject_ops, 0);
- ffi->inject_rate = (int)rate;
+ ffi->inject_rate = (unsigned int)rate;
f2fs_info(sbi, "build fault injection rate: %lu", rate);
}
@@ -1379,7 +1379,7 @@ static int f2fs_default_check(struct f2fs_sb_info *sbi)
#endif
if (test_opt(sbi, INLINE_XATTR_SIZE)) {
- int min_size, max_size;
+ unsigned int min_size, max_size;
if (!f2fs_sb_has_extra_attr(sbi) ||
!f2fs_sb_has_flexible_inline_xattr(sbi)) {
@@ -1396,7 +1396,7 @@ static int f2fs_default_check(struct f2fs_sb_info *sbi)
if (F2FS_OPTION(sbi).inline_xattr_size < min_size ||
F2FS_OPTION(sbi).inline_xattr_size > max_size) {
- f2fs_err(sbi, "inline xattr size is out of range: %d ~
%d",
+ f2fs_err(sbi, "inline xattr size is out of range: %u ~
%u",
min_size, max_size);
return -EINVAL;
}
--
2.49.0
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
