net/mlx5: Add ConnectX-5 PCIe 4.0 to list of supported devices

[deliverable/linux.git] / fs / nilfs2 / segbuf.c

diff --git a/fs/nilfs2/segbuf.c b/fs/nilfs2/segbuf.c
index 52f6a6c8bab17881587a2987337c9859fd8f12c5..bf36df10540b692dc2eee698a07296edcbd0267b 100644 (file)
--- a/fs/nilfs2/segbuf.c
+++ b/fs/nilfs2/segbuf.c
@@ -129,7 +129,7 @@ int nilfs_segbuf_extend_payload(struct nilfs_segment_buffer *segbuf,
        return 0;
 }
 
-int nilfs_segbuf_reset(struct nilfs_segment_buffer *segbuf, unsigned flags,
+int nilfs_segbuf_reset(struct nilfs_segment_buffer *segbuf, unsigned int flags,
                       time_t ctime, __u64 cno)
 {
        int err;
@@ -236,7 +236,7 @@ nilfs_segbuf_fill_in_super_root_crc(struct nilfs_segment_buffer *segbuf,
 {
        struct nilfs_super_root *raw_sr;
        struct the_nilfs *nilfs = segbuf->sb_super->s_fs_info;
-       unsigned srsize;
+       unsigned int srsize;
        u32 crc;
 
        raw_sr = (struct nilfs_super_root *)segbuf->sb_super_root->b_data;