exfat: change exfat_set_vol_flags() return type void.
Subsystems (2)
PATCH 1/1 exfat: change exfat_set_vol_flags() return type void.
exfat_set_vol_flags() always return 0.
So, change function return type as void.
Signed-off-by youngjun <[email protected]>
--- fs/exfat/exfat_fs.h | 2 +- fs/exfat/super.c | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-)
fs/exfat/exfat_fs.h +1 -1
@@ -383,7 +383,7 @@ static inline int exfat_sector_to_cluster(struct exfat_sb_info *sbi, }/* super.c */ -int exfat_set_vol_flags (struct super_block *sb,unsigned short new_flag); +void exfat_set_vol_flags (struct super_block *sb,unsigned short new_flag);/* fatent.c */ #define exfat_get_next_cluster (sb, pclu) exfat_ent_get(sb, *(pclu), pclu)
fs/exfat/super.c +7 -8
@@ -58,17 +58,16 @@ static void exfat_put_super(struct super_block *sb)static int exfat_sync_fs (struct super_block *sb,int wait) {struct exfat_sb_info *sbi =EXFAT_SB (sb); -int err =0 ;/* If there are some dirty buffers in the bdev inode */ mutex_lock (&sbi->s_lock);if (test_and_clear_bit (EXFAT_SB_DIRTY , &sbi->s_state)) {sync_blockdev (sb->s_bdev); -if (exfat_set_vol_flags (sb,VOL_CLEAN )) - err = -EIO ; +exfat_set_vol_flags (sb,VOL_CLEAN ); + }mutex_unlock (&sbi->s_lock); -return err; +return 0 ; }static int exfat_statfs (struct dentry *dentry,struct kstatfs *buf)
@@ -98,7 +97,7 @@ static int exfat_statfs(struct dentry *dentry, struct kstatfs *buf)return 0 ; } -int exfat_set_vol_flags (struct super_block *sb,unsigned short new_flag) +void exfat_set_vol_flags (struct super_block *sb,unsigned short new_flag) {struct exfat_sb_info *sbi =EXFAT_SB (sb);struct boot_sector *p_boot = (struct boot_sector *)sbi->boot_bh->b_data;
@@ -106,7 +105,7 @@ int exfat_set_vol_flags(struct super_block *sb, unsigned short new_flag)/* flags are not changed */ if (sbi->vol_flag == new_flag) -return 0 ; +return ; sbi->vol_flag = new_flag;
@@ -114,7 +113,7 @@ int exfat_set_vol_flags(struct super_block *sb, unsigned short new_flag)* if this volume has been mounted with read-only */ if (sb_rdonly (sb)) -return 0 ; +return ; p_boot->vol_flags =cpu_to_le16 (new_flag);
@@ -128,7 +127,7 @@ int exfat_set_vol_flags(struct super_block *sb, unsigned short new_flag)if (sync)sync_dirty_buffer (sbi->boot_bh); -return 0 ; +return ; }static int exfat_show_options (struct seq_file *m,struct dentry *root)
Signature · 1 line
2.17.1
Quoted 2 lines · youngjun
exfat_set_vol_flags()always return 0.
So, change function return type as void.
On the contrary, I think it should be fixed to return an appropriate error.
fs/exfat/super.c int exfat_set_vol_flags(struct super_block *sb, unsigned short new_flag) · line 116
Quoted 6 lines
fs/exfat/super.c +1
-1@@ -114,7 +113,7 @@ int exfat_set_vol_flags(struct super_block *sb, unsigned short new_flag)* if this volume has been mounted with read-only */ if (sb_rdonly (sb)) -return 0 ; +return ;
Some other FileSystems return -EROFS.
exfat-fs may also need to return it.
(If so, the caller will also need to be modified)
fs/exfat/super.c int exfat_set_vol_flags(struct super_block *sb, unsigned short new_flag) · line 130
Quoted 8 lines
fs/exfat/super.c +1
-1p_boot->vol_flags =cpu_to_le16 (new_flag);@@ -128,7 +127,7 @@ int exfat_set_vol_flags(struct super_block *sb, unsigned short new_flag)if (sync)sync_dirty_buffer (sbi->boot_bh); -return 0 ; +return ;
Shouldn't the execution result be returned when sync_dirty_buffer() is executed?
BR
---
Tetsuhiro Kohada <[email protected]>