Merge tag 'drm-atmel-hlcdc-fixes/for-4.7-rc5' of github.com:bbrezillon/linux-at91...

[linux-2.6-block.git] / fs / nilfs2 / sysfs.c

diff --git a/fs/nilfs2/sysfs.c b/fs/nilfs2/sysfs.c
index bbb0dcc35905c661ca41012a3f60046a671161a8..8ffa42b704d8fc564137ba3fd81bddcedf45036f 100644 (file)
--- a/fs/nilfs2/sysfs.c
+++ b/fs/nilfs2/sysfs.c
@@ -68,7 +68,7 @@ static ssize_t nilfs_##name##_attr_store(struct kobject *kobj, \
 static const struct sysfs_ops nilfs_##name##_attr_ops = { \
        .show   = nilfs_##name##_attr_show, \
        .store  = nilfs_##name##_attr_store, \
-};
+}
 
 #define NILFS_DEV_INT_GROUP_TYPE(name, parent_name) \
 static void nilfs_##name##_attr_release(struct kobject *kobj) \
@@ -84,7 +84,7 @@ static struct kobj_type nilfs_##name##_ktype = { \
        .default_attrs  = nilfs_##name##_attrs, \
        .sysfs_ops      = &nilfs_##name##_attr_ops, \
        .release        = nilfs_##name##_attr_release, \
-};
+}
 
 #define NILFS_DEV_INT_GROUP_FNS(name, parent_name) \
 static int nilfs_sysfs_create_##name##_group(struct the_nilfs *nilfs) \
@@ -756,7 +756,7 @@ nilfs_superblock_sb_write_count_show(struct nilfs_superblock_attr *attr,
                                      struct the_nilfs *nilfs,
                                      char *buf)
 {
-       unsigned sbwcount;
+       unsigned int sbwcount;
 
        down_read(&nilfs->ns_sem);
        sbwcount = nilfs->ns_sbwcount;
@@ -770,7 +770,7 @@ nilfs_superblock_sb_update_frequency_show(struct nilfs_superblock_attr *attr,
                                            struct the_nilfs *nilfs,
                                            char *buf)
 {
-       unsigned sb_update_freq;
+       unsigned int sb_update_freq;
 
        down_read(&nilfs->ns_sem);
        sb_update_freq = nilfs->ns_sb_update_freq;
@@ -784,7 +784,7 @@ nilfs_superblock_sb_update_frequency_store(struct nilfs_superblock_attr *attr,
                                            struct the_nilfs *nilfs,
                                            const char *buf, size_t count)
 {
-       unsigned val;
+       unsigned int val;
        int err;
 
        err = kstrtouint(skip_spaces(buf), 0, &val);