Merge tag 'iwlwifi-for-john-2014-11-23' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / fs / btrfs / sysfs.h

diff --git a/fs/btrfs/sysfs.h b/fs/btrfs/sysfs.h
index ac46df3..f7dd298 100644 (file)
--- a/fs/btrfs/sysfs.h
+++ b/fs/btrfs/sysfs.h
@@ -20,16 +20,20 @@ enum btrfs_feature_set {
        .store  = _store,                                               \
 }
 
-#define BTRFS_ATTR_RW(_name, _mode, _show, _store)                     \
-static struct kobj_attribute btrfs_attr_##_name =                      \
-                       __INIT_KOBJ_ATTR(_name, _mode, _show, _store)
-#define BTRFS_ATTR(_name, _mode, _show)                                        \
-       BTRFS_ATTR_RW(_name, _mode, _show, NULL)
+#define BTRFS_ATTR_RW(_name, _show, _store)                    \
+       static struct kobj_attribute btrfs_attr_##_name =               \
+                       __INIT_KOBJ_ATTR(_name, 0644, _show, _store)
+
+#define BTRFS_ATTR(_name, _show)                                       \
+       static struct kobj_attribute btrfs_attr_##_name =               \
+                       __INIT_KOBJ_ATTR(_name, 0444, _show, NULL)
+
 #define BTRFS_ATTR_PTR(_name)    (&btrfs_attr_##_name.attr)
 
 #define BTRFS_RAID_ATTR(_name, _show)                                  \
-static struct kobj_attribute btrfs_raid_attr_##_name =                 \
+       static struct kobj_attribute btrfs_raid_attr_##_name =          \
                        __INIT_KOBJ_ATTR(_name, 0444, _show, NULL)
+
 #define BTRFS_RAID_ATTR_PTR(_name)    (&btrfs_raid_attr_##_name.attr)