[PATCH] rock: remove CHECK_CE
Remove the CHECK_CE macro Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
a40ea8f22e
commit
04f7aa9c7d
@@ -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:
|
|||||||
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:
|
|||||||
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:
|
|||||||
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;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user