Remove the CHECK_CE macro Signed-off-by: Andrew Morton --- 25-akpm/fs/isofs/rock.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff -puN fs/isofs/rock.c~rock-remove-CHECK_CE fs/isofs/rock.c --- 25/fs/isofs/rock.c~rock-remove-CHECK_CE 2005-03-30 18:02:27.000000000 -0800 +++ 25-akpm/fs/isofs/rock.c 2005-03-30 18:02:27.000000000 -0800 @@ -43,11 +43,6 @@ static int check_sp(struct rock_ridge *r return 0; } -#define CHECK_CE \ - {cont_extent = isonum_733(rr->u.CE.extent); \ - cont_offset = isonum_733(rr->u.CE.offset); \ - cont_size = isonum_733(rr->u.CE.size);} - #define SETUP_ROCK_RIDGE(DE,CHR,LEN) \ {LEN= sizeof(struct iso_directory_record) + DE->name_len[0]; \ if(LEN & 1) LEN++; \ @@ -132,7 +127,9 @@ repeat: goto out; break; case SIG('C', 'E'): - CHECK_CE; + cont_extent = isonum_733(rr->u.CE.extent); + cont_offset = isonum_733(rr->u.CE.offset); + cont_size = isonum_733(rr->u.CE.size); break; case SIG('N', 'M'): if (truncate) @@ -229,7 +226,9 @@ repeat: goto out; break; case SIG('C', 'E'): - CHECK_CE; + cont_extent = isonum_733(rr->u.CE.extent); + cont_offset = isonum_733(rr->u.CE.offset); + cont_size = isonum_733(rr->u.CE.size); break; case SIG('E', 'R'): ISOFS_SB(inode->i_sb)->s_rock = 1; @@ -598,7 +597,9 @@ repeat: break; case SIG('C', 'E'): /* This tells is if there is a continuation record */ - CHECK_CE; + cont_extent = isonum_733(rr->u.CE.extent); + cont_offset = isonum_733(rr->u.CE.offset); + cont_size = isonum_733(rr->u.CE.size); default: break; } _