diff options
Diffstat (limited to 'fs/aufs/fstype.h')
| -rw-r--r-- | fs/aufs/fstype.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/fs/aufs/fstype.h b/fs/aufs/fstype.h index 725b2ffff..95b78b96c 100644 --- a/fs/aufs/fstype.h +++ b/fs/aufs/fstype.h @@ -28,7 +28,7 @@ static inline const char *au_sbtype(struct super_block *sb) static inline int au_test_iso9660(struct super_block *sb __maybe_unused) { -#if defined(CONFIG_ISO9660_FS) || defined(CONFIG_ISO9660_FS_MODULE) +#if IS_ENABLED(CONFIG_ISO9660_FS) return sb->s_magic == ISOFS_SUPER_MAGIC; #else return 0; @@ -37,7 +37,7 @@ static inline int au_test_iso9660(struct super_block *sb __maybe_unused) static inline int au_test_romfs(struct super_block *sb __maybe_unused) { -#if defined(CONFIG_ROMFS_FS) || defined(CONFIG_ROMFS_FS_MODULE) +#if IS_ENABLED(CONFIG_ROMFS_FS) return sb->s_magic == ROMFS_MAGIC; #else return 0; @@ -46,7 +46,7 @@ static inline int au_test_romfs(struct super_block *sb __maybe_unused) static inline int au_test_cramfs(struct super_block *sb __maybe_unused) { -#if defined(CONFIG_CRAMFS) || defined(CONFIG_CRAMFS_MODULE) +#if IS_ENABLED(CONFIG_CRAMFS) return sb->s_magic == CRAMFS_MAGIC; #endif return 0; @@ -54,7 +54,7 @@ static inline int au_test_cramfs(struct super_block *sb __maybe_unused) static inline int au_test_nfs(struct super_block *sb __maybe_unused) { -#if defined(CONFIG_NFS_FS) || defined(CONFIG_NFS_FS_MODULE) +#if IS_ENABLED(CONFIG_NFS_FS) return sb->s_magic == NFS_SUPER_MAGIC; #else return 0; @@ -63,7 +63,7 @@ static inline int au_test_nfs(struct super_block *sb __maybe_unused) static inline int au_test_fuse(struct super_block *sb __maybe_unused) { -#if defined(CONFIG_FUSE_FS) || defined(CONFIG_FUSE_FS_MODULE) +#if IS_ENABLED(CONFIG_FUSE_FS) return sb->s_magic == FUSE_SUPER_MAGIC; #else return 0; @@ -72,7 +72,7 @@ static inline int au_test_fuse(struct super_block *sb __maybe_unused) static inline int au_test_xfs(struct super_block *sb __maybe_unused) { -#if defined(CONFIG_XFS_FS) || defined(CONFIG_XFS_FS_MODULE) +#if IS_ENABLED(CONFIG_XFS_FS) return sb->s_magic == XFS_SB_MAGIC; #else return 0; @@ -90,7 +90,7 @@ static inline int au_test_tmpfs(struct super_block *sb __maybe_unused) static inline int au_test_ecryptfs(struct super_block *sb __maybe_unused) { -#if defined(CONFIG_ECRYPT_FS) || defined(CONFIG_ECRYPT_FS_MODULE) +#if IS_ENABLED(CONFIG_ECRYPT_FS) return !strcmp(au_sbtype(sb), "ecryptfs"); #else return 0; @@ -104,7 +104,7 @@ static inline int au_test_ramfs(struct super_block *sb) static inline int au_test_ubifs(struct super_block *sb __maybe_unused) { -#if defined(CONFIG_UBIFS_FS) || defined(CONFIG_UBIFS_FS_MODULE) +#if IS_ENABLED(CONFIG_UBIFS_FS) return sb->s_magic == UBIFS_SUPER_MAGIC; #else return 0; @@ -131,7 +131,7 @@ static inline int au_test_sysfs(struct super_block *sb __maybe_unused) static inline int au_test_configfs(struct super_block *sb __maybe_unused) { -#if defined(CONFIG_CONFIGFS_FS) || defined(CONFIG_CONFIGFS_FS_MODULE) +#if IS_ENABLED(CONFIG_CONFIGFS_FS) return sb->s_magic == CONFIGFS_MAGIC; #else return 0; @@ -140,7 +140,7 @@ static inline int au_test_configfs(struct super_block *sb __maybe_unused) static inline int au_test_minix(struct super_block *sb __maybe_unused) { -#if defined(CONFIG_MINIX_FS) || defined(CONFIG_MINIX_FS_MODULE) +#if IS_ENABLED(CONFIG_MINIX_FS) return sb->s_magic == MINIX3_SUPER_MAGIC || sb->s_magic == MINIX2_SUPER_MAGIC || sb->s_magic == MINIX2_SUPER_MAGIC2 @@ -153,7 +153,7 @@ static inline int au_test_minix(struct super_block *sb __maybe_unused) static inline int au_test_fat(struct super_block *sb __maybe_unused) { -#if defined(CONFIG_FAT_FS) || defined(CONFIG_FAT_FS_MODULE) +#if IS_ENABLED(CONFIG_FAT_FS) return sb->s_magic == MSDOS_SUPER_MAGIC; #else return 0; @@ -181,7 +181,7 @@ static inline int au_test_securityfs(struct super_block *sb __maybe_unused) static inline int au_test_squashfs(struct super_block *sb __maybe_unused) { -#if defined(CONFIG_SQUASHFS) || defined(CONFIG_SQUASHFS_MODULE) +#if IS_ENABLED(CONFIG_SQUASHFS) return sb->s_magic == SQUASHFS_MAGIC; #else return 0; @@ -190,7 +190,7 @@ static inline int au_test_squashfs(struct super_block *sb __maybe_unused) static inline int au_test_btrfs(struct super_block *sb __maybe_unused) { -#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE) +#if IS_ENABLED(CONFIG_BTRFS_FS) return sb->s_magic == BTRFS_SUPER_MAGIC; #else return 0; @@ -199,7 +199,7 @@ static inline int au_test_btrfs(struct super_block *sb __maybe_unused) static inline int au_test_xenfs(struct super_block *sb __maybe_unused) { -#if defined(CONFIG_XENFS) || defined(CONFIG_XENFS_MODULE) +#if IS_ENABLED(CONFIG_XENFS) return sb->s_magic == XENFS_SUPER_MAGIC; #else return 0; @@ -217,7 +217,7 @@ static inline int au_test_debugfs(struct super_block *sb __maybe_unused) static inline int au_test_nilfs(struct super_block *sb __maybe_unused) { -#if defined(CONFIG_NILFS) || defined(CONFIG_NILFS_MODULE) +#if IS_ENABLED(CONFIG_NILFS) return sb->s_magic == NILFS_SUPER_MAGIC; #else return 0; @@ -226,7 +226,7 @@ static inline int au_test_nilfs(struct super_block *sb __maybe_unused) static inline int au_test_hfsplus(struct super_block *sb __maybe_unused) { -#if defined(CONFIG_HFSPLUS_FS) || defined(CONFIG_HFSPLUS_FS_MODULE) +#if IS_ENABLED(CONFIG_HFSPLUS_FS) return sb->s_magic == HFSPLUS_SUPER_MAGIC; #else return 0; |