f2fs: fix sparse warnings

This patch resolves the following warnings.

include/trace/events/f2fs.h:150:1: warning: expression using sizeof bool
include/trace/events/f2fs.h:180:1: warning: expression using sizeof bool
include/trace/events/f2fs.h:990:1: warning: expression using sizeof bool
include/trace/events/f2fs.h:990:1: warning: expression using sizeof bool
include/trace/events/f2fs.h:150:1: warning: odd constant _Bool cast (ffffffffffffffff becomes 1)
include/trace/events/f2fs.h:180:1: warning: odd constant _Bool cast (ffffffffffffffff becomes 1)
include/trace/events/f2fs.h:990:1: warning: odd constant _Bool cast (ffffffffffffffff becomes 1)
include/trace/events/f2fs.h:990:1: warning: odd constant _Bool cast (ffffffffffffffff becomes 1)

fs/f2fs/checkpoint.c:27:19: warning: symbol 'inode_entry_slab' was not declared. Should it be static?
fs/f2fs/checkpoint.c:577:15: warning: cast to restricted __le32
fs/f2fs/checkpoint.c:592:15: warning: cast to restricted __le32

fs/f2fs/trace.c:19:1: warning: symbol 'pids' was not declared. Should it be static?
fs/f2fs/trace.c:21:21: warning: symbol 'last_io' was not declared. Should it be static?

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index 58d88df0d632acacfcab00be797272f1a129ad45..7f794b72b3b7d27f36828fac8eb84fea21bfdc69 100644 (file)
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -574,7 +574,7 @@ static struct page *validate_checkpoint(struct f2fs_sb_info *sbi,
        if (crc_offset >= blk_size)
                goto invalid_cp1;
 
-       crc = le32_to_cpu(*((__u32 *)((unsigned char *)cp_block + crc_offset)));
+       crc = le32_to_cpu(*((__le32 *)((unsigned char *)cp_block + crc_offset)));
        if (!f2fs_crc_valid(crc, cp_block, crc_offset))
                goto invalid_cp1;
 
@@ -589,7 +589,7 @@ static struct page *validate_checkpoint(struct f2fs_sb_info *sbi,
        if (crc_offset >= blk_size)
                goto invalid_cp2;
 
-       crc = le32_to_cpu(*((__u32 *)((unsigned char *)cp_block + crc_offset)));
+       crc = le32_to_cpu(*((__le32 *)((unsigned char *)cp_block + crc_offset)));
        if (!f2fs_crc_valid(crc, cp_block, crc_offset))
                goto invalid_cp2;
 

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 337204dfc5cd3f5a4caca4b570645acdb97d5f18..7fa3313ab0e27381b95d48b22da8315e605ef567 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -1681,6 +1681,7 @@ extern const struct address_space_operations f2fs_meta_aops;
 extern const struct inode_operations f2fs_dir_inode_operations;
 extern const struct inode_operations f2fs_symlink_inode_operations;
 extern const struct inode_operations f2fs_special_inode_operations;
+extern struct kmem_cache *inode_entry_slab;
 
 /*
  * inline.c

diff --git a/fs/f2fs/gc.h b/fs/f2fs/gc.h
index d5ff97c5e3942c7f85c81bf8f1a2a97b7e36068e..b4a65be9f7d3fc03a9b1836873f392fea1cfd646 100644 (file)
--- a/fs/f2fs/gc.h
+++ b/fs/f2fs/gc.h
@@ -40,8 +40,6 @@ struct gc_inode_list {
        struct radix_tree_root iroot;
 };
 
-extern struct kmem_cache *inode_entry_slab;
-
 /*
  * inline functions
  */

diff --git a/fs/f2fs/trace.c b/fs/f2fs/trace.c
index ce01a2c903bd734c8bd56f870eeb9b20676675be..875aa8179bc1733cb665724961856d86bca091bb 100644 (file)
--- a/fs/f2fs/trace.c
+++ b/fs/f2fs/trace.c
@@ -16,9 +16,9 @@
 #include "f2fs.h"
 #include "trace.h"
 
-RADIX_TREE(pids, GFP_ATOMIC);
+static RADIX_TREE(pids, GFP_ATOMIC);
 static spinlock_t pids_lock;
-struct last_io_info last_io;
+static struct last_io_info last_io;
 
 static inline void __print_last_io(void)
 {

diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h
index 69629826c2bab3413e95001e2b12389163b44196..5422dbfaf97d651798c6fec1bace15cc3ea31fff 100644 (file)
--- a/include/trace/events/f2fs.h
+++ b/include/trace/events/f2fs.h
@@ -149,14 +149,14 @@ DEFINE_EVENT(f2fs__inode, f2fs_sync_file_enter,
 
 TRACE_EVENT(f2fs_sync_file_exit,
 
-       TP_PROTO(struct inode *inode, bool need_cp, int datasync, int ret),
+       TP_PROTO(struct inode *inode, int need_cp, int datasync, int ret),
 
        TP_ARGS(inode, need_cp, datasync, ret),
 
        TP_STRUCT__entry(
                __field(dev_t,  dev)
                __field(ino_t,  ino)
-               __field(bool,   need_cp)
+               __field(int,    need_cp)
                __field(int,    datasync)
                __field(int,    ret)
        ),
@@ -185,7 +185,7 @@ TRACE_EVENT(f2fs_sync_fs,
 
        TP_STRUCT__entry(
                __field(dev_t,  dev)
-               __field(bool,   dirty)
+               __field(int,    dirty)
                __field(int,    wait)
        ),
 
@@ -989,14 +989,15 @@ TRACE_EVENT(f2fs_issue_discard,
 
 TRACE_EVENT(f2fs_issue_flush,
 
-       TP_PROTO(struct super_block *sb, bool nobarrier, bool flush_merge),
+       TP_PROTO(struct super_block *sb, unsigned int nobarrier,
+                                       unsigned int flush_merge),
 
        TP_ARGS(sb, nobarrier, flush_merge),
 
        TP_STRUCT__entry(
                __field(dev_t,  dev)
-               __field(bool, nobarrier)
-               __field(bool, flush_merge)
+               __field(unsigned int, nobarrier)
+               __field(unsigned int, flush_merge)
        ),
 
        TP_fast_assign(