Commit 04f7aa9c authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] rock: remove CHECK_CE

Remove the CHECK_CE macro
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a40ea8f2
...@@ -37,11 +37,6 @@ static int check_sp(struct rock_ridge *rr, struct inode *inode) ...@@ -37,11 +37,6 @@ static int check_sp(struct rock_ridge *rr, struct inode *inode)
return 0; 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) \ #define SETUP_ROCK_RIDGE(DE,CHR,LEN) \
{LEN= sizeof(struct iso_directory_record) + DE->name_len[0]; \ {LEN= sizeof(struct iso_directory_record) + DE->name_len[0]; \
if(LEN & 1) LEN++; \ if(LEN & 1) LEN++; \
...@@ -126,7 +121,9 @@ repeat: ...@@ -126,7 +121,9 @@ repeat:
goto out; goto out;
break; break;
case SIG('C', 'E'): 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; break;
case SIG('N', 'M'): case SIG('N', 'M'):
if (truncate) if (truncate)
...@@ -223,7 +220,9 @@ repeat: ...@@ -223,7 +220,9 @@ repeat:
goto out; goto out;
break; break;
case SIG('C', 'E'): 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; break;
case SIG('E', 'R'): case SIG('E', 'R'):
ISOFS_SB(inode->i_sb)->s_rock = 1; ISOFS_SB(inode->i_sb)->s_rock = 1;
...@@ -592,7 +591,9 @@ repeat: ...@@ -592,7 +591,9 @@ repeat:
break; break;
case SIG('C', 'E'): case SIG('C', 'E'):
/* This tells is if there is a continuation record */ /* 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: default:
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment