|
4 | 4 | */ |
5 | 5 |
|
6 | 6 | #include <linux/version.h> |
7 | | -#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0) |
| 7 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) |
8 | 8 | #include <linux/fs_context.h> |
9 | 9 | #include <linux/fs_parser.h> |
10 | 10 | #else |
@@ -237,7 +237,7 @@ static const struct super_operations exfat_sops = { |
237 | 237 | .show_options = exfat_show_options, |
238 | 238 | }; |
239 | 239 |
|
240 | | -#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0) |
| 240 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) |
241 | 241 | enum { |
242 | 242 | Opt_uid, |
243 | 243 | Opt_gid, |
@@ -303,7 +303,7 @@ static const struct fs_parameter_spec exfat_param_specs[] = { |
303 | 303 | {} |
304 | 304 | }; |
305 | 305 |
|
306 | | -#if LINUX_VERSION_CODE <= KERNEL_VERSION(5, 5, 0) |
| 306 | +#if LINUX_VERSION_CODE <= KERNEL_VERSION(5, 6, 0) |
307 | 307 | static const struct fs_parameter_description exfat_parameters = { |
308 | 308 | .name = "exfat", |
309 | 309 | .specs = exfat_param_specs, |
@@ -824,15 +824,15 @@ static int __exfat_fill_super(struct super_block *sb) |
824 | 824 | return ret; |
825 | 825 | } |
826 | 826 |
|
827 | | -#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0) |
| 827 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) |
828 | 828 | static int exfat_fill_super(struct super_block *sb, struct fs_context *fc) |
829 | 829 | #else |
830 | 830 | static int exfat_fill_super(struct super_block *sb, void *data, int silent) |
831 | 831 | #endif |
832 | 832 | { |
833 | 833 | struct inode *root_inode; |
834 | 834 | int err; |
835 | | -#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0) |
| 835 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) |
836 | 836 | struct exfat_sb_info *sbi = sb->s_fs_info; |
837 | 837 | struct exfat_mount_options *opts = &sbi->options; |
838 | 838 |
|
@@ -895,7 +895,7 @@ static int exfat_fill_super(struct super_block *sb, void *data, int silent) |
895 | 895 | exfat_hash_init(sb); |
896 | 896 |
|
897 | 897 | if (!strcmp(sbi->options.iocharset, "utf8")) |
898 | | -#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0) |
| 898 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) |
899 | 899 | opts->utf8 = 1; |
900 | 900 | #else |
901 | 901 | sbi->options.utf8 = 1; |
@@ -964,7 +964,7 @@ static int exfat_fill_super(struct super_block *sb, void *data, int silent) |
964 | 964 | return err; |
965 | 965 | } |
966 | 966 |
|
967 | | -#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0) |
| 967 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) |
968 | 968 | static int exfat_get_tree(struct fs_context *fc) |
969 | 969 | { |
970 | 970 | return get_tree_bdev(fc, exfat_fill_super); |
@@ -1031,13 +1031,9 @@ static struct dentry *exfat_fs_mount(struct file_system_type *fs_type, |
1031 | 1031 | static struct file_system_type exfat_fs_type = { |
1032 | 1032 | .owner = THIS_MODULE, |
1033 | 1033 | .name = "exfat", |
1034 | | -#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0) |
1035 | | - .init_fs_context = exfat_init_fs_context, |
1036 | 1034 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) |
| 1035 | + .init_fs_context = exfat_init_fs_context, |
1037 | 1036 | .parameters = exfat_parameters, |
1038 | | -#else |
1039 | | - .parameters = &exfat_parameters, |
1040 | | -#endif |
1041 | 1037 | #else |
1042 | 1038 | .mount = exfat_fs_mount, |
1043 | 1039 | #endif |
|
0 commit comments