Skip to content

Commit de8180f

Browse files
committed
exfat: fix build error with linux-5.15 kernel
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
1 parent b366b0b commit de8180f

2 files changed

Lines changed: 10 additions & 0 deletions

File tree

file.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,11 @@ static vm_fault_t exfat_page_mkwrite(struct vm_fault *vmf)
769769
err = exfat_extend_valid_size(file, end);
770770
if (err < 0) {
771771
inode_unlock(inode);
772+
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 6, 0)
772773
return vmf_fs_error(err);
774+
#else
775+
return block_page_mkwrite_return(err);
776+
#endif
773777
}
774778
}
775779

super.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,9 @@ static int exfat_show_options(struct seq_file *m, struct dentry *root)
177177

178178
int exfat_force_shutdown(struct super_block *sb, u32 flags)
179179
{
180+
#if LINUX_VERSION_CODE > KERNEL_VERSION(6, 9, 0)
180181
int ret;
182+
#endif
181183
struct exfat_sb_info *sbi = sb->s_fs_info;
182184
struct exfat_mount_options *opts = &sbi->options;
183185

@@ -187,10 +189,12 @@ int exfat_force_shutdown(struct super_block *sb, u32 flags)
187189
switch (flags) {
188190
case EXFAT_GOING_DOWN_DEFAULT:
189191
case EXFAT_GOING_DOWN_FULLSYNC:
192+
#if LINUX_VERSION_CODE > KERNEL_VERSION(6, 9, 0)
190193
ret = bdev_freeze(sb->s_bdev);
191194
if (ret)
192195
return ret;
193196
bdev_thaw(sb->s_bdev);
197+
#endif
194198
set_bit(EXFAT_FLAGS_SHUTDOWN, &sbi->s_exfat_flags);
195199
break;
196200
case EXFAT_GOING_DOWN_NOSYNC:
@@ -240,7 +244,9 @@ static const struct super_operations exfat_sops = {
240244
.sync_fs = exfat_sync_fs,
241245
.statfs = exfat_statfs,
242246
.show_options = exfat_show_options,
247+
#if LINUX_VERSION_CODE > KERNEL_VERSION(5, 16, 0)
243248
.shutdown = exfat_shutdown,
249+
#endif
244250
};
245251

246252
enum {

0 commit comments

Comments
 (0)