diff options
| author | Chris Mason <clm@fb.com> | 2015-03-25 10:52:48 -0700 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-03-25 10:52:48 -0700 |
| commit | fc4c3c872f44bf425963feba57eb9c3f8ac2d7eb (patch) | |
| tree | 0d49c3e4d8f64a4cc0d3f42f37430fc60007e28b /fs/btrfs/sysfs.c | |
| parent | 9deed229fa8a83bb5cd713b2d2a8e5c022a4b45b (diff) | |
| parent | a4f3d2c4efe2628329249b64fd5799468e025b9d (diff) | |
| download | linux-fc4c3c872f44bf425963feba57eb9c3f8ac2d7eb.tar.gz linux-fc4c3c872f44bf425963feba57eb9c3f8ac2d7eb.tar.bz2 linux-fc4c3c872f44bf425963feba57eb9c3f8ac2d7eb.zip | |
Merge branch 'cleanups-post-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.1
Signed-off-by: Chris Mason <clm@fb.com>
Conflicts:
fs/btrfs/disk-io.c
Diffstat (limited to 'fs/btrfs/sysfs.c')
| -rw-r--r-- | fs/btrfs/sysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c index 94edb0a2a026..e8a4c86d274d 100644 --- a/fs/btrfs/sysfs.c +++ b/fs/btrfs/sysfs.c @@ -459,7 +459,7 @@ static inline struct btrfs_fs_info *to_fs_info(struct kobject *kobj) static char btrfs_unknown_feature_names[3][NUM_FEATURE_BITS][13]; static struct btrfs_feature_attr btrfs_feature_attrs[3][NUM_FEATURE_BITS]; -static u64 supported_feature_masks[3] = { +static const u64 supported_feature_masks[3] = { [FEAT_COMPAT] = BTRFS_FEATURE_COMPAT_SUPP, [FEAT_COMPAT_RO] = BTRFS_FEATURE_COMPAT_RO_SUPP, [FEAT_INCOMPAT] = BTRFS_FEATURE_INCOMPAT_SUPP, |