Commit ea1499aa authored by René Scharfe's avatar René Scharfe Committed by Linus Torvalds

[PATCH] Remove unused function from fs/isofs/rock.c

find_rock_ridge_relocation() has been unused since 2.4.0-test11 -- time
to bury it.

Acked by Peter Anvin.
parent 4971461f
...@@ -84,76 +84,6 @@ ...@@ -84,76 +84,6 @@
printk("Unable to read rock-ridge attributes\n"); \ printk("Unable to read rock-ridge attributes\n"); \
}} }}
/* This is the inner layer of the get filename routine, and is called
for each system area and continuation record related to the file */
int find_rock_ridge_relocation(struct iso_directory_record * de,
struct inode * inode) {
int flag;
int len;
int retval;
unsigned char * chr;
CONTINUE_DECLS;
flag = 0;
/* If this is a '..' then we are looking for the parent, otherwise we
are looking for the child */
if (de->name[0]==1 && de->name_len[0]==1) flag = 1;
/* Return value if we do not find appropriate record. */
retval = isonum_733 (de->extent);
if (!ISOFS_SB(inode->i_sb)->s_rock) return retval;
SETUP_ROCK_RIDGE(de, chr, len);
repeat:
{
int rrflag, sig;
struct rock_ridge * rr;
while (len > 1){ /* There may be one byte for padding somewhere */
rr = (struct rock_ridge *) chr;
if (rr->len == 0) goto out; /* Something got screwed up here */
sig = isonum_721(chr);
chr += rr->len;
len -= rr->len;
switch(sig){
case SIG('R','R'):
rrflag = rr->u.RR.flags[0];
if (flag && !(rrflag & RR_PL)) goto out;
if (!flag && !(rrflag & RR_CL)) goto out;
break;
case SIG('S','P'):
CHECK_SP(goto out);
break;
case SIG('C','L'):
if (flag == 0) {
retval = isonum_733(rr->u.CL.location);
goto out;
}
break;
case SIG('P','L'):
if (flag != 0) {
retval = isonum_733(rr->u.PL.location);
goto out;
}
break;
case SIG('C','E'):
CHECK_CE; /* This tells is if there is a continuation record */
break;
default:
break;
}
}
}
MAYBE_CONTINUE(repeat, inode);
return retval;
out:
if(buffer) kfree(buffer);
return retval;
}
/* return length of name field; 0: not found, -1: to be ignored */ /* return length of name field; 0: not found, -1: to be ignored */
int get_rock_ridge_filename(struct iso_directory_record * de, int get_rock_ridge_filename(struct iso_directory_record * de,
char * retname, struct inode * inode) char * retname, struct inode * inode)
......
...@@ -224,8 +224,6 @@ extern int parse_rock_ridge_inode(struct iso_directory_record *, struct inode *) ...@@ -224,8 +224,6 @@ extern int parse_rock_ridge_inode(struct iso_directory_record *, struct inode *)
extern int get_rock_ridge_filename(struct iso_directory_record *, char *, struct inode *); extern int get_rock_ridge_filename(struct iso_directory_record *, char *, struct inode *);
extern int isofs_name_translate(struct iso_directory_record *, char *, struct inode *); extern int isofs_name_translate(struct iso_directory_record *, char *, struct inode *);
extern int find_rock_ridge_relocation(struct iso_directory_record *, struct inode *);
int get_joliet_filename(struct iso_directory_record *, unsigned char *, struct inode *); int get_joliet_filename(struct iso_directory_record *, unsigned char *, struct inode *);
int get_acorn_filename(struct iso_directory_record *, char *, struct inode *); int get_acorn_filename(struct iso_directory_record *, char *, struct inode *);
......
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