[PATCH] rock: remove CONTINUE_DECLS
Remove the CONTINUE_DECLS macro. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
12121714fb
commit
a40ea8f22e
|
@ -37,14 +37,6 @@ static int check_sp(struct rock_ridge *rr, struct inode *inode)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* We define a series of macros because each function must do exactly the
|
|
||||||
same thing in certain places. We use the macros to ensure that everything
|
|
||||||
is done correctly */
|
|
||||||
|
|
||||||
#define CONTINUE_DECLS \
|
|
||||||
int cont_extent = 0, cont_offset = 0, cont_size = 0; \
|
|
||||||
void *buffer = NULL
|
|
||||||
|
|
||||||
#define CHECK_CE \
|
#define CHECK_CE \
|
||||||
{cont_extent = isonum_733(rr->u.CE.extent); \
|
{cont_extent = isonum_733(rr->u.CE.extent); \
|
||||||
cont_offset = isonum_733(rr->u.CE.offset); \
|
cont_offset = isonum_733(rr->u.CE.offset); \
|
||||||
|
@ -98,7 +90,10 @@ int get_rock_ridge_filename(struct iso_directory_record *de,
|
||||||
{
|
{
|
||||||
int len;
|
int len;
|
||||||
unsigned char *chr;
|
unsigned char *chr;
|
||||||
CONTINUE_DECLS;
|
int cont_extent = 0;
|
||||||
|
int cont_offset = 0;
|
||||||
|
int cont_size = 0;
|
||||||
|
void *buffer = NULL;
|
||||||
struct rock_ridge *rr;
|
struct rock_ridge *rr;
|
||||||
int sig;
|
int sig;
|
||||||
int retnamlen = 0;
|
int retnamlen = 0;
|
||||||
|
@ -188,8 +183,10 @@ parse_rock_ridge_inode_internal(struct iso_directory_record *de,
|
||||||
struct inode *reloc;
|
struct inode *reloc;
|
||||||
struct rock_ridge *rr;
|
struct rock_ridge *rr;
|
||||||
int rootflag;
|
int rootflag;
|
||||||
|
int cont_extent = 0;
|
||||||
CONTINUE_DECLS;
|
int cont_offset = 0;
|
||||||
|
int cont_size = 0;
|
||||||
|
void *buffer = NULL;
|
||||||
|
|
||||||
if (!ISOFS_SB(inode->i_sb)->s_rock)
|
if (!ISOFS_SB(inode->i_sb)->s_rock)
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -532,7 +529,10 @@ static int rock_ridge_symlink_readpage(struct file *file, struct page *page)
|
||||||
char *rpnt = link;
|
char *rpnt = link;
|
||||||
unsigned char *pnt;
|
unsigned char *pnt;
|
||||||
struct iso_directory_record *raw_inode;
|
struct iso_directory_record *raw_inode;
|
||||||
CONTINUE_DECLS;
|
int cont_extent = 0;
|
||||||
|
int cont_offset = 0;
|
||||||
|
int cont_size = 0;
|
||||||
|
void *buffer = NULL;
|
||||||
unsigned long block, offset;
|
unsigned long block, offset;
|
||||||
int sig;
|
int sig;
|
||||||
int len;
|
int len;
|
||||||
|
|
Loading…
Reference in New Issue