isofs: Cleanup mount option processing
Subsystems (2)
Jan Kara
maintainerPATCH 3/3 isofs: Cleanup mount option processing
Remove unused variables from isofs_sb_info (used to be some mount options), unify variables for option to use 0/1 (some options used 'y'/'n'), use bit fields for option flags in superblock.
Signed-off-by Jan Kara <[email protected]>
--- fs/isofs/dir.c | 5 ++--- fs/isofs/inode.c | 48 ++++++++++++++++++++++++------------------------ fs/isofs/isofs.h | 28 ++++++++++++---------------- fs/isofs/namei.c | 4 ++-- 4 files changed, 40 insertions(+), 45 deletions(-)
fs/isofs/dir.c +2 -3
@@ -195,9 +195,8 @@ static int do_isofs_readdir(struct inode *inode, struct file *filp,* Do not report hidden files if so instructed, or associated * files unless instructed to do so */ -if ((sbi->s_hide =='y' && - (de->flags[-sbi->s_high_sierra] &1 )) || - (sbi->s_showassoc =='n' && +if ((sbi->s_hide && (de->flags[-sbi->s_high_sierra] &1 )) || + (!sbi->s_showassoc && (de->flags[-sbi->s_high_sierra] &4 ))) { filp->f_pos += de_len;continue ;
fs/isofs/inode.c +24 -24
107 lines not on this page · raw message
fs/isofs/isofs.h +12 -16
@@ -35,24 +35,20 @@ struct isofs_sb_info {unsigned long s_log_zone_size;unsigned long s_max_size; -unsigned char s_high_sierra;/* A simple flag */ -unsigned char s_mapping;int s_rock_offset;/* offset of SUSP fields within SU area */ -unsigned char s_rock;unsigned char s_joliet_level; -unsigned char s_utf8; -unsigned char s_cruft;/* Broken disks with high -byte of length containing -junk */ -unsigned char s_unhide; -unsigned char s_nosuid; -unsigned char s_nodev; -unsigned char s_nocompress; -unsigned char s_hide; -unsigned char s_showassoc; -unsigned char s_overriderockperm; -unsigned char s_uid_set; -unsigned char s_gid_set; +unsigned char s_mapping; + unsigned int s_high_sierra:1; + unsigned int s_rock:2; + unsigned int s_utf8:1; + unsigned int s_cruft:1; /* Broken disks with high byte of length +* containing junk */ + unsigned int s_nocompress:1; + unsigned int s_hide:1; + unsigned int s_showassoc:1; + unsigned int s_overriderockperm:1; + unsigned int s_uid_set:1; + unsigned int s_gid_set:1;mode_t s_fmode;mode_t s_dmode;
fs/isofs/namei.c +2 -2
@@ -142,9 +142,9 @@ isofs_find_entry(struct inode *dir, struct dentry *dentry,*/ match =0 ;if (dlen >0 && - (sbi->s_hide =='n' || + (!sbi->s_hide || (!(de->flags[-sbi->s_high_sierra] &1 ))) && - (sbi->s_showassoc =='y' || + (sbi->s_showassoc || (!(de->flags[-sbi->s_high_sierra] &4 )))) { match = (isofs_cmp (dentry, dpnt, dlen) ==0 ); }
Signature · 1 line
1.6.0.2