Skip to content

Commit

Permalink
[PATCH] rock: remove CHECK_CE
Browse files Browse the repository at this point in the history
Remove the CHECK_CE macro

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Andrew Morton authored and Linus Torvalds committed Jun 22, 2005
1 parent a40ea8f commit 04f7aa9
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions fs/isofs/rock.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,6 @@ static int check_sp(struct rock_ridge *rr, struct inode *inode)
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++; \
Expand Down Expand Up @@ -126,7 +121,9 @@ int get_rock_ridge_filename(struct iso_directory_record *de,
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)
Expand Down Expand Up @@ -223,7 +220,9 @@ parse_rock_ridge_inode_internal(struct iso_directory_record *de,
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;
Expand Down Expand Up @@ -592,7 +591,9 @@ static int rock_ridge_symlink_readpage(struct file *file, struct page *page)
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;
}
Expand Down

0 comments on commit 04f7aa9

Please sign in to comment.