From: Andrew Morton - Remove new CodingStyle inventions - brelse(0) is legal. Signed-off-by: Jeremy White Signed-off-by: Andrew Morton --- fs/isofs/dir.c | 11 ++++++++--- fs/isofs/namei.c | 16 +++++++++------- 2 files changed, 17 insertions(+), 10 deletions(-) diff -puN fs/isofs/dir.c~isofs-show-hidden-files-add-granularity-for-assoc-hidden-files-flags-tidy fs/isofs/dir.c --- 25/fs/isofs/dir.c~isofs-show-hidden-files-add-granularity-for-assoc-hidden-files-flags-tidy 2005-06-05 22:48:01.000000000 -0700 +++ 25-akpm/fs/isofs/dir.c 2005-06-05 22:48:01.000000000 -0700 @@ -194,9 +194,14 @@ static int do_isofs_readdir(struct inode /* Handle everything else. Do name translation if there is no Rock Ridge NM field. */ - /* 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' && (de->flags[-sbi->s_high_sierra] & 4) ) ) { + /* + * 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' && + (de->flags[-sbi->s_high_sierra] & 4))) { filp->f_pos += de_len; continue; } diff -puN fs/isofs/namei.c~isofs-show-hidden-files-add-granularity-for-assoc-hidden-files-flags-tidy fs/isofs/namei.c --- 25/fs/isofs/namei.c~isofs-show-hidden-files-add-granularity-for-assoc-hidden-files-flags-tidy 2005-06-05 22:48:01.000000000 -0700 +++ 25-akpm/fs/isofs/namei.c 2005-06-05 22:48:01.000000000 -0700 @@ -131,14 +131,16 @@ isofs_find_entry(struct inode *dir, stru } /* - * Skip hidden or associated files unless hide or showassoc, respectively, is set + * Skip hidden or associated files unless hide or showassoc, + * respectively, is set */ match = 0; if (dlen > 0 && - ( sbi->s_hide =='n' || (!(de->flags[-sbi->s_high_sierra] & 1)) ) && - ( sbi->s_showassoc =='y' || (!(de->flags[-sbi->s_high_sierra] & 4)) ) ) - { - match = (isofs_cmp(dentry,dpnt,dlen) == 0); + (sbi->s_hide =='n' || + (!(de->flags[-sbi->s_high_sierra] & 1))) && + (sbi->s_showassoc =='y' || + (!(de->flags[-sbi->s_high_sierra] & 4)))) { + match = (isofs_cmp(dentry, dpnt, dlen) == 0); } if (match) { isofs_normalize_block_and_offset(de, @@ -146,11 +148,11 @@ isofs_find_entry(struct inode *dir, stru &offset_saved); *block_rv = block_saved; *offset_rv = offset_saved; - if (bh) brelse(bh); + brelse(bh); return 1; } } - if (bh) brelse(bh); + brelse(bh); return 0; } _