mirror of
https://github.com/torvalds/linux.git
synced 2024-10-23 21:50:43 +00:00
udf: Remove dead code
Remove code that gets never used. Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
parent
0cc6d77e55
commit
5891d9dd2a
|
@ -18,59 +18,6 @@
|
||||||
#include <linux/string.h>
|
#include <linux/string.h>
|
||||||
#include <linux/buffer_head.h>
|
#include <linux/buffer_head.h>
|
||||||
|
|
||||||
#if 0
|
|
||||||
static uint8_t *udf_filead_read(struct inode *dir, uint8_t *tmpad,
|
|
||||||
uint8_t ad_size, struct kernel_lb_addr fe_loc,
|
|
||||||
int *pos, int *offset, struct buffer_head **bh,
|
|
||||||
int *error)
|
|
||||||
{
|
|
||||||
int loffset = *offset;
|
|
||||||
int block;
|
|
||||||
uint8_t *ad;
|
|
||||||
int remainder;
|
|
||||||
|
|
||||||
*error = 0;
|
|
||||||
|
|
||||||
ad = (uint8_t *)(*bh)->b_data + *offset;
|
|
||||||
*offset += ad_size;
|
|
||||||
|
|
||||||
if (!ad) {
|
|
||||||
brelse(*bh);
|
|
||||||
*error = 1;
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (*offset == dir->i_sb->s_blocksize) {
|
|
||||||
brelse(*bh);
|
|
||||||
block = udf_get_lb_pblock(dir->i_sb, fe_loc, ++*pos);
|
|
||||||
if (!block)
|
|
||||||
return NULL;
|
|
||||||
*bh = udf_tread(dir->i_sb, block);
|
|
||||||
if (!*bh)
|
|
||||||
return NULL;
|
|
||||||
} else if (*offset > dir->i_sb->s_blocksize) {
|
|
||||||
ad = tmpad;
|
|
||||||
|
|
||||||
remainder = dir->i_sb->s_blocksize - loffset;
|
|
||||||
memcpy((uint8_t *)ad, (*bh)->b_data + loffset, remainder);
|
|
||||||
|
|
||||||
brelse(*bh);
|
|
||||||
block = udf_get_lb_pblock(dir->i_sb, fe_loc, ++*pos);
|
|
||||||
if (!block)
|
|
||||||
return NULL;
|
|
||||||
(*bh) = udf_tread(dir->i_sb, block);
|
|
||||||
if (!*bh)
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
memcpy((uint8_t *)ad + remainder, (*bh)->b_data,
|
|
||||||
ad_size - remainder);
|
|
||||||
*offset = ad_size - remainder;
|
|
||||||
}
|
|
||||||
|
|
||||||
return ad;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
struct fileIdentDesc *udf_fileident_read(struct inode *dir, loff_t *nf_pos,
|
struct fileIdentDesc *udf_fileident_read(struct inode *dir, loff_t *nf_pos,
|
||||||
struct udf_fileident_bh *fibh,
|
struct udf_fileident_bh *fibh,
|
||||||
struct fileIdentDesc *cfi,
|
struct fileIdentDesc *cfi,
|
||||||
|
@ -248,39 +195,6 @@ struct fileIdentDesc *udf_get_fileident(void *buffer, int bufsize, int *offset)
|
||||||
return fi;
|
return fi;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if 0
|
|
||||||
static struct extent_ad *udf_get_fileextent(void *buffer, int bufsize, int *offset)
|
|
||||||
{
|
|
||||||
struct extent_ad *ext;
|
|
||||||
struct fileEntry *fe;
|
|
||||||
uint8_t *ptr;
|
|
||||||
|
|
||||||
if ((!buffer) || (!offset)) {
|
|
||||||
printk(KERN_ERR "udf: udf_get_fileextent() invalidparms\n");
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
fe = (struct fileEntry *)buffer;
|
|
||||||
|
|
||||||
if (fe->descTag.tagIdent != cpu_to_le16(TAG_IDENT_FE)) {
|
|
||||||
udf_debug("0x%x != TAG_IDENT_FE\n",
|
|
||||||
le16_to_cpu(fe->descTag.tagIdent));
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
ptr = (uint8_t *)(fe->extendedAttr) +
|
|
||||||
le32_to_cpu(fe->lengthExtendedAttr);
|
|
||||||
|
|
||||||
if ((*offset > 0) && (*offset < le32_to_cpu(fe->lengthAllocDescs)))
|
|
||||||
ptr += *offset;
|
|
||||||
|
|
||||||
ext = (struct extent_ad *)ptr;
|
|
||||||
|
|
||||||
*offset = *offset + sizeof(struct extent_ad);
|
|
||||||
return ext;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
struct short_ad *udf_get_fileshortad(uint8_t *ptr, int maxoffset, uint32_t *offset,
|
struct short_ad *udf_get_fileshortad(uint8_t *ptr, int maxoffset, uint32_t *offset,
|
||||||
int inc)
|
int inc)
|
||||||
{
|
{
|
||||||
|
|
|
@ -36,14 +36,10 @@ unsigned int udf_get_last_session(struct super_block *sb)
|
||||||
ms_info.addr_format = CDROM_LBA;
|
ms_info.addr_format = CDROM_LBA;
|
||||||
i = ioctl_by_bdev(bdev, CDROMMULTISESSION, (unsigned long)&ms_info);
|
i = ioctl_by_bdev(bdev, CDROMMULTISESSION, (unsigned long)&ms_info);
|
||||||
|
|
||||||
#define WE_OBEY_THE_WRITTEN_STANDARDS 1
|
|
||||||
|
|
||||||
if (i == 0) {
|
if (i == 0) {
|
||||||
udf_debug("XA disk: %s, vol_desc_start=%d\n",
|
udf_debug("XA disk: %s, vol_desc_start=%d\n",
|
||||||
(ms_info.xa_flag ? "yes" : "no"), ms_info.addr.lba);
|
(ms_info.xa_flag ? "yes" : "no"), ms_info.addr.lba);
|
||||||
#if WE_OBEY_THE_WRITTEN_STANDARDS
|
|
||||||
if (ms_info.xa_flag) /* necessary for a valid ms_info.addr */
|
if (ms_info.xa_flag) /* necessary for a valid ms_info.addr */
|
||||||
#endif
|
|
||||||
vol_desc_start = ms_info.addr.lba;
|
vol_desc_start = ms_info.addr.lba;
|
||||||
} else {
|
} else {
|
||||||
udf_debug("CDROMMULTISESSION not supported: rc=%d\n", i);
|
udf_debug("CDROMMULTISESSION not supported: rc=%d\n", i);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user