UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

btrfs: constify static arrays 

There are a few statically initialized arrays that can be made const.
The remaining (like file_system_type, sysfs attributes or prop handlers)
do not allow that due to type mismatch when passed to the APIs or
because the structures are modified through other members.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2015-11-19 11:42:31 +01:00
parent 20e5506baf
commit 4d4ab6d6bc
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/btrfs/ctree.h
View File

@ -174,7 +174,7 @@ struct btrfs_ordered_sum;
/* csum types */ /* csum types */
#define BTRFS_CSUM_TYPE_CRC32 0 #define BTRFS_CSUM_TYPE_CRC32 0
static int btrfs_csum_sizes[] = { 4 }; static const int btrfs_csum_sizes[] = { 4 };
/* four bytes for CRC32 */ /* four bytes for CRC32 */
#define BTRFS_EMPTY_DIR_SIZE 0 #define BTRFS_EMPTY_DIR_SIZE 0

2
fs/btrfs/inode.c
View File

@ -83,7 +83,7 @@ struct kmem_cache *btrfs_path_cachep;
struct kmem_cache *btrfs_free_space_cachep; struct kmem_cache *btrfs_free_space_cachep;
#define S_SHIFT 12 #define S_SHIFT 12
static unsigned char btrfs_type_by_mode[S_IFMT >> S_SHIFT] = { static const unsigned char btrfs_type_by_mode[S_IFMT >> S_SHIFT] = {
[S_IFREG >> S_SHIFT] = BTRFS_FT_REG_FILE, [S_IFREG >> S_SHIFT] = BTRFS_FT_REG_FILE,
[S_IFDIR >> S_SHIFT] = BTRFS_FT_DIR, [S_IFDIR >> S_SHIFT] = BTRFS_FT_DIR,
[S_IFCHR >> S_SHIFT] = BTRFS_FT_CHRDEV, [S_IFCHR >> S_SHIFT] = BTRFS_FT_CHRDEV,

2
fs/btrfs/ioctl.c
View File

@ -5286,7 +5286,7 @@ out_unlock:
static int btrfs_ioctl_get_supported_features(struct file *file, static int btrfs_ioctl_get_supported_features(struct file *file,
void __user *arg) void __user *arg)
{ {
static struct btrfs_ioctl_feature_flags features[3] = { static const struct btrfs_ioctl_feature_flags features[3] = {
INIT_FEATURE_FLAGS(SUPP), INIT_FEATURE_FLAGS(SUPP),
INIT_FEATURE_FLAGS(SAFE_SET), INIT_FEATURE_FLAGS(SAFE_SET),
INIT_FEATURE_FLAGS(SAFE_CLEAR) INIT_FEATURE_FLAGS(SAFE_CLEAR)

2
fs/btrfs/super.c
View File

@ -309,7 +309,7 @@ enum {
Opt_err, Opt_err,
}; };
static match_table_t tokens = { static const match_table_t tokens = {
{Opt_degraded, "degraded"}, {Opt_degraded, "degraded"},
{Opt_subvol, "subvol=%s"}, {Opt_subvol, "subvol=%s"},
{Opt_subvolid, "subvolid=%s"}, {Opt_subvolid, "subvolid=%s"},