aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/udf/dir.c4
-rw-r--r--fs/udf/directory.c2
-rw-r--r--fs/udf/inode.c28
-rw-r--r--fs/udf/namei.c12
-rw-r--r--fs/udf/truncate.c21
-rw-r--r--fs/udf/udfdecl.h6
6 files changed, 38 insertions, 35 deletions
diff --git a/fs/udf/dir.c b/fs/udf/dir.c
index 2391c9150c49..3c50b82a2307 100644
--- a/fs/udf/dir.c
+++ b/fs/udf/dir.c
@@ -113,7 +113,8 @@ do_udf_readdir(struct inode * dir, struct file *filp, filldir_t filldir, void *d
113 loff_t size = (udf_ext0_offset(dir) + dir->i_size) >> 2; 113 loff_t size = (udf_ext0_offset(dir) + dir->i_size) >> 2;
114 struct buffer_head * bh = NULL, * tmp, * bha[16]; 114 struct buffer_head * bh = NULL, * tmp, * bha[16];
115 kernel_lb_addr bloc, eloc; 115 kernel_lb_addr bloc, eloc;
116 uint32_t extoffset, elen, offset; 116 uint32_t extoffset, elen;
117 sector_t offset;
117 int i, num; 118 int i, num;
118 unsigned int dt_type; 119 unsigned int dt_type;
119 120
@@ -129,7 +130,6 @@ do_udf_readdir(struct inode * dir, struct file *filp, filldir_t filldir, void *d
129 else if (inode_bmap(dir, nf_pos >> (dir->i_sb->s_blocksize_bits - 2), 130 else if (inode_bmap(dir, nf_pos >> (dir->i_sb->s_blocksize_bits - 2),
130 &bloc, &extoffset, &eloc, &elen, &offset, &bh) == (EXT_RECORDED_ALLOCATED >> 30)) 131 &bloc, &extoffset, &eloc, &elen, &offset, &bh) == (EXT_RECORDED_ALLOCATED >> 30))
131 { 132 {
132 offset >>= dir->i_sb->s_blocksize_bits;
133 block = udf_get_lb_pblock(dir->i_sb, eloc, offset); 133 block = udf_get_lb_pblock(dir->i_sb, eloc, offset);
134 if ((++offset << dir->i_sb->s_blocksize_bits) < elen) 134 if ((++offset << dir->i_sb->s_blocksize_bits) < elen)
135 { 135 {
diff --git a/fs/udf/directory.c b/fs/udf/directory.c
index fe751a2a0e47..024ccac8b7f4 100644
--- a/fs/udf/directory.c
+++ b/fs/udf/directory.c
@@ -77,7 +77,7 @@ udf_fileident_read(struct inode *dir, loff_t *nf_pos,
77 struct fileIdentDesc *cfi, 77 struct fileIdentDesc *cfi,
78 kernel_lb_addr *bloc, uint32_t *extoffset, 78 kernel_lb_addr *bloc, uint32_t *extoffset,
79 kernel_lb_addr *eloc, uint32_t *elen, 79 kernel_lb_addr *eloc, uint32_t *elen,
80 uint32_t *offset, struct buffer_head **bh) 80 sector_t *offset, struct buffer_head **bh)
81{ 81{
82 struct fileIdentDesc *fi; 82 struct fileIdentDesc *fi;
83 int i, num, block; 83 int i, num, block;
diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index ae21a0e59e95..6b094250d805 100644
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -49,7 +49,7 @@ MODULE_LICENSE("GPL");
49static mode_t udf_convert_permissions(struct fileEntry *); 49static mode_t udf_convert_permissions(struct fileEntry *);
50static int udf_update_inode(struct inode *, int); 50static int udf_update_inode(struct inode *, int);
51static void udf_fill_inode(struct inode *, struct buffer_head *); 51static void udf_fill_inode(struct inode *, struct buffer_head *);
52static struct buffer_head *inode_getblk(struct inode *, long, int *, 52static struct buffer_head *inode_getblk(struct inode *, sector_t, int *,
53 long *, int *); 53 long *, int *);
54static int8_t udf_insert_aext(struct inode *, kernel_lb_addr, int, 54static int8_t udf_insert_aext(struct inode *, kernel_lb_addr, int,
55 kernel_lb_addr, uint32_t, struct buffer_head *); 55 kernel_lb_addr, uint32_t, struct buffer_head *);
@@ -354,7 +354,7 @@ udf_getblk(struct inode *inode, long block, int create, int *err)
354 return NULL; 354 return NULL;
355} 355}
356 356
357static struct buffer_head * inode_getblk(struct inode * inode, long block, 357static struct buffer_head * inode_getblk(struct inode * inode, sector_t block,
358 int *err, long *phys, int *new) 358 int *err, long *phys, int *new)
359{ 359{
360 struct buffer_head *pbh = NULL, *cbh = NULL, *nbh = NULL, *result = NULL; 360 struct buffer_head *pbh = NULL, *cbh = NULL, *nbh = NULL, *result = NULL;
@@ -364,14 +364,15 @@ static struct buffer_head * inode_getblk(struct inode * inode, long block,
364 uint32_t elen = 0; 364 uint32_t elen = 0;
365 kernel_lb_addr eloc, pbloc, cbloc, nbloc; 365 kernel_lb_addr eloc, pbloc, cbloc, nbloc;
366 int c = 1; 366 int c = 1;
367 uint64_t lbcount = 0, b_off = 0; 367 loff_t lbcount = 0, b_off = 0;
368 uint32_t newblocknum, newblock, offset = 0; 368 uint32_t newblocknum, newblock;
369 sector_t offset = 0;
369 int8_t etype; 370 int8_t etype;
370 int goal = 0, pgoal = UDF_I_LOCATION(inode).logicalBlockNum; 371 int goal = 0, pgoal = UDF_I_LOCATION(inode).logicalBlockNum;
371 char lastblock = 0; 372 char lastblock = 0;
372 373
373 pextoffset = cextoffset = nextoffset = udf_file_entry_alloc_offset(inode); 374 pextoffset = cextoffset = nextoffset = udf_file_entry_alloc_offset(inode);
374 b_off = (uint64_t)block << inode->i_sb->s_blocksize_bits; 375 b_off = (loff_t)block << inode->i_sb->s_blocksize_bits;
375 pbloc = cbloc = nbloc = UDF_I_LOCATION(inode); 376 pbloc = cbloc = nbloc = UDF_I_LOCATION(inode);
376 377
377 /* find the extent which contains the block we are looking for. 378 /* find the extent which contains the block we are looking for.
@@ -1948,10 +1949,10 @@ int8_t udf_delete_aext(struct inode *inode, kernel_lb_addr nbloc, int nextoffset
1948 return (elen >> 30); 1949 return (elen >> 30);
1949} 1950}
1950 1951
1951int8_t inode_bmap(struct inode *inode, int block, kernel_lb_addr *bloc, uint32_t *extoffset, 1952int8_t inode_bmap(struct inode *inode, sector_t block, kernel_lb_addr *bloc, uint32_t *extoffset,
1952 kernel_lb_addr *eloc, uint32_t *elen, uint32_t *offset, struct buffer_head **bh) 1953 kernel_lb_addr *eloc, uint32_t *elen, sector_t *offset, struct buffer_head **bh)
1953{ 1954{
1954 uint64_t lbcount = 0, bcount = (uint64_t)block << inode->i_sb->s_blocksize_bits; 1955 loff_t lbcount = 0, bcount = (loff_t)block << inode->i_sb->s_blocksize_bits;
1955 int8_t etype; 1956 int8_t etype;
1956 1957
1957 if (block < 0) 1958 if (block < 0)
@@ -1968,29 +1969,30 @@ int8_t inode_bmap(struct inode *inode, int block, kernel_lb_addr *bloc, uint32_t
1968 { 1969 {
1969 if ((etype = udf_next_aext(inode, bloc, extoffset, eloc, elen, bh, 1)) == -1) 1970 if ((etype = udf_next_aext(inode, bloc, extoffset, eloc, elen, bh, 1)) == -1)
1970 { 1971 {
1971 *offset = bcount - lbcount; 1972 *offset = (bcount - lbcount) >> inode->i_sb->s_blocksize_bits;
1972 UDF_I_LENEXTENTS(inode) = lbcount; 1973 UDF_I_LENEXTENTS(inode) = lbcount;
1973 return -1; 1974 return -1;
1974 } 1975 }
1975 lbcount += *elen; 1976 lbcount += *elen;
1976 } while (lbcount <= bcount); 1977 } while (lbcount <= bcount);
1977 1978
1978 *offset = bcount + *elen - lbcount; 1979 *offset = (bcount + *elen - lbcount) >> inode->i_sb->s_blocksize_bits;
1979 1980
1980 return etype; 1981 return etype;
1981} 1982}
1982 1983
1983long udf_block_map(struct inode *inode, long block) 1984long udf_block_map(struct inode *inode, sector_t block)
1984{ 1985{
1985 kernel_lb_addr eloc, bloc; 1986 kernel_lb_addr eloc, bloc;
1986 uint32_t offset, extoffset, elen; 1987 uint32_t extoffset, elen;
1988 sector_t offset;
1987 struct buffer_head *bh = NULL; 1989 struct buffer_head *bh = NULL;
1988 int ret; 1990 int ret;
1989 1991
1990 lock_kernel(); 1992 lock_kernel();
1991 1993
1992 if (inode_bmap(inode, block, &bloc, &extoffset, &eloc, &elen, &offset, &bh) == (EXT_RECORDED_ALLOCATED >> 30)) 1994 if (inode_bmap(inode, block, &bloc, &extoffset, &eloc, &elen, &offset, &bh) == (EXT_RECORDED_ALLOCATED >> 30))
1993 ret = udf_get_lb_pblock(inode->i_sb, eloc, offset >> inode->i_sb->s_blocksize_bits); 1995 ret = udf_get_lb_pblock(inode->i_sb, eloc, offset);
1994 else 1996 else
1995 ret = 0; 1997 ret = 0;
1996 1998
diff --git a/fs/udf/namei.c b/fs/udf/namei.c
index b25437527de4..b9859ac169c4 100644
--- a/fs/udf/namei.c
+++ b/fs/udf/namei.c
@@ -156,7 +156,8 @@ udf_find_entry(struct inode *dir, struct dentry *dentry,
156 uint16_t liu; 156 uint16_t liu;
157 loff_t size; 157 loff_t size;
158 kernel_lb_addr bloc, eloc; 158 kernel_lb_addr bloc, eloc;
159 uint32_t extoffset, elen, offset; 159 uint32_t extoffset, elen;
160 sector_t offset;
160 struct buffer_head *bh = NULL; 161 struct buffer_head *bh = NULL;
161 162
162 size = (udf_ext0_offset(dir) + dir->i_size) >> 2; 163 size = (udf_ext0_offset(dir) + dir->i_size) >> 2;
@@ -168,7 +169,6 @@ udf_find_entry(struct inode *dir, struct dentry *dentry,
168 else if (inode_bmap(dir, f_pos >> (dir->i_sb->s_blocksize_bits - 2), 169 else if (inode_bmap(dir, f_pos >> (dir->i_sb->s_blocksize_bits - 2),
169 &bloc, &extoffset, &eloc, &elen, &offset, &bh) == (EXT_RECORDED_ALLOCATED >> 30)) 170 &bloc, &extoffset, &eloc, &elen, &offset, &bh) == (EXT_RECORDED_ALLOCATED >> 30))
170 { 171 {
171 offset >>= dir->i_sb->s_blocksize_bits;
172 block = udf_get_lb_pblock(dir->i_sb, eloc, offset); 172 block = udf_get_lb_pblock(dir->i_sb, eloc, offset);
173 if ((++offset << dir->i_sb->s_blocksize_bits) < elen) 173 if ((++offset << dir->i_sb->s_blocksize_bits) < elen)
174 { 174 {
@@ -354,7 +354,8 @@ udf_add_entry(struct inode *dir, struct dentry *dentry,
354 uint16_t liu; 354 uint16_t liu;
355 int block; 355 int block;
356 kernel_lb_addr bloc, eloc; 356 kernel_lb_addr bloc, eloc;
357 uint32_t extoffset, elen, offset; 357 uint32_t extoffset, elen;
358 sector_t offset;
358 struct buffer_head *bh = NULL; 359 struct buffer_head *bh = NULL;
359 360
360 sb = dir->i_sb; 361 sb = dir->i_sb;
@@ -386,7 +387,6 @@ udf_add_entry(struct inode *dir, struct dentry *dentry,
386 else if (inode_bmap(dir, f_pos >> (dir->i_sb->s_blocksize_bits - 2), 387 else if (inode_bmap(dir, f_pos >> (dir->i_sb->s_blocksize_bits - 2),
387 &bloc, &extoffset, &eloc, &elen, &offset, &bh) == (EXT_RECORDED_ALLOCATED >> 30)) 388 &bloc, &extoffset, &eloc, &elen, &offset, &bh) == (EXT_RECORDED_ALLOCATED >> 30))
388 { 389 {
389 offset >>= dir->i_sb->s_blocksize_bits;
390 block = udf_get_lb_pblock(dir->i_sb, eloc, offset); 390 block = udf_get_lb_pblock(dir->i_sb, eloc, offset);
391 if ((++offset << dir->i_sb->s_blocksize_bits) < elen) 391 if ((++offset << dir->i_sb->s_blocksize_bits) < elen)
392 { 392 {
@@ -782,7 +782,8 @@ static int empty_dir(struct inode *dir)
782 loff_t size = (udf_ext0_offset(dir) + dir->i_size) >> 2; 782 loff_t size = (udf_ext0_offset(dir) + dir->i_size) >> 2;
783 int block; 783 int block;
784 kernel_lb_addr bloc, eloc; 784 kernel_lb_addr bloc, eloc;
785 uint32_t extoffset, elen, offset; 785 uint32_t extoffset, elen;
786 sector_t offset;
786 struct buffer_head *bh = NULL; 787 struct buffer_head *bh = NULL;
787 788
788 f_pos = (udf_ext0_offset(dir) >> 2); 789 f_pos = (udf_ext0_offset(dir) >> 2);
@@ -794,7 +795,6 @@ static int empty_dir(struct inode *dir)
794 else if (inode_bmap(dir, f_pos >> (dir->i_sb->s_blocksize_bits - 2), 795 else if (inode_bmap(dir, f_pos >> (dir->i_sb->s_blocksize_bits - 2),
795 &bloc, &extoffset, &eloc, &elen, &offset, &bh) == (EXT_RECORDED_ALLOCATED >> 30)) 796 &bloc, &extoffset, &eloc, &elen, &offset, &bh) == (EXT_RECORDED_ALLOCATED >> 30))
796 { 797 {
797 offset >>= dir->i_sb->s_blocksize_bits;
798 block = udf_get_lb_pblock(dir->i_sb, eloc, offset); 798 block = udf_get_lb_pblock(dir->i_sb, eloc, offset);
799 if ((++offset << dir->i_sb->s_blocksize_bits) < elen) 799 if ((++offset << dir->i_sb->s_blocksize_bits) < elen)
800 { 800 {
diff --git a/fs/udf/truncate.c b/fs/udf/truncate.c
index 0abd66ce36ea..ebd0f37f8b16 100644
--- a/fs/udf/truncate.c
+++ b/fs/udf/truncate.c
@@ -125,9 +125,10 @@ void udf_discard_prealloc(struct inode * inode)
125void udf_truncate_extents(struct inode * inode) 125void udf_truncate_extents(struct inode * inode)
126{ 126{
127 kernel_lb_addr bloc, eloc, neloc = { 0, 0 }; 127 kernel_lb_addr bloc, eloc, neloc = { 0, 0 };
128 uint32_t extoffset, elen, offset, nelen = 0, lelen = 0, lenalloc; 128 uint32_t extoffset, elen, nelen = 0, lelen = 0, lenalloc;
129 int8_t etype; 129 int8_t etype;
130 int first_block = inode->i_size >> inode->i_sb->s_blocksize_bits; 130 sector_t first_block = inode->i_size >> inode->i_sb->s_blocksize_bits, offset;
131 loff_t byte_offset;
131 struct buffer_head *bh = NULL; 132 struct buffer_head *bh = NULL;
132 int adsize; 133 int adsize;
133 134
@@ -139,14 +140,14 @@ void udf_truncate_extents(struct inode * inode)
139 adsize = 0; 140 adsize = 0;
140 141
141 etype = inode_bmap(inode, first_block, &bloc, &extoffset, &eloc, &elen, &offset, &bh); 142 etype = inode_bmap(inode, first_block, &bloc, &extoffset, &eloc, &elen, &offset, &bh);
142 offset += (inode->i_size & (inode->i_sb->s_blocksize - 1)); 143 byte_offset = (offset << inode->i_sb->s_blocksize_bits) + (inode->i_size & (inode->i_sb->s_blocksize-1));
143 if (etype != -1) 144 if (etype != -1)
144 { 145 {
145 extoffset -= adsize; 146 extoffset -= adsize;
146 extent_trunc(inode, bloc, extoffset, eloc, etype, elen, bh, offset); 147 extent_trunc(inode, bloc, extoffset, eloc, etype, elen, bh, byte_offset);
147 extoffset += adsize; 148 extoffset += adsize;
148 149
149 if (offset) 150 if (byte_offset)
150 lenalloc = extoffset; 151 lenalloc = extoffset;
151 else 152 else
152 lenalloc = extoffset - adsize; 153 lenalloc = extoffset - adsize;
@@ -237,7 +238,7 @@ void udf_truncate_extents(struct inode * inode)
237 } 238 }
238 else if (inode->i_size) 239 else if (inode->i_size)
239 { 240 {
240 if (offset) 241 if (byte_offset)
241 { 242 {
242 /* 243 /*
243 * OK, there is not extent covering inode->i_size and 244 * OK, there is not extent covering inode->i_size and
@@ -248,7 +249,7 @@ void udf_truncate_extents(struct inode * inode)
248 (bh && extoffset == sizeof(struct allocExtDesc))) { 249 (bh && extoffset == sizeof(struct allocExtDesc))) {
249 /* File has no extents at all! */ 250 /* File has no extents at all! */
250 memset(&eloc, 0x00, sizeof(kernel_lb_addr)); 251 memset(&eloc, 0x00, sizeof(kernel_lb_addr));
251 elen = EXT_NOT_RECORDED_NOT_ALLOCATED | offset; 252 elen = EXT_NOT_RECORDED_NOT_ALLOCATED | byte_offset;
252 udf_add_aext(inode, &bloc, &extoffset, eloc, elen, &bh, 1); 253 udf_add_aext(inode, &bloc, &extoffset, eloc, elen, &bh, 1);
253 } 254 }
254 else { 255 else {
@@ -257,7 +258,7 @@ void udf_truncate_extents(struct inode * inode)
257 if (etype == (EXT_NOT_RECORDED_NOT_ALLOCATED >> 30)) 258 if (etype == (EXT_NOT_RECORDED_NOT_ALLOCATED >> 30))
258 { 259 {
259 extoffset -= adsize; 260 extoffset -= adsize;
260 elen = EXT_NOT_RECORDED_NOT_ALLOCATED | (elen + offset); 261 elen = EXT_NOT_RECORDED_NOT_ALLOCATED | (elen + byte_offset);
261 udf_write_aext(inode, bloc, &extoffset, eloc, elen, bh, 0); 262 udf_write_aext(inode, bloc, &extoffset, eloc, elen, bh, 0);
262 } 263 }
263 else if (etype == (EXT_NOT_RECORDED_ALLOCATED >> 30)) 264 else if (etype == (EXT_NOT_RECORDED_ALLOCATED >> 30))
@@ -265,7 +266,7 @@ void udf_truncate_extents(struct inode * inode)
265 kernel_lb_addr neloc = { 0, 0 }; 266 kernel_lb_addr neloc = { 0, 0 };
266 extoffset -= adsize; 267 extoffset -= adsize;
267 nelen = EXT_NOT_RECORDED_NOT_ALLOCATED | 268 nelen = EXT_NOT_RECORDED_NOT_ALLOCATED |
268 ((elen + offset + inode->i_sb->s_blocksize - 1) & 269 ((elen + byte_offset + inode->i_sb->s_blocksize - 1) &
269 ~(inode->i_sb->s_blocksize - 1)); 270 ~(inode->i_sb->s_blocksize - 1));
270 udf_write_aext(inode, bloc, &extoffset, neloc, nelen, bh, 1); 271 udf_write_aext(inode, bloc, &extoffset, neloc, nelen, bh, 1);
271 udf_add_aext(inode, &bloc, &extoffset, eloc, (etype << 30) | elen, &bh, 1); 272 udf_add_aext(inode, &bloc, &extoffset, eloc, (etype << 30) | elen, &bh, 1);
@@ -281,7 +282,7 @@ void udf_truncate_extents(struct inode * inode)
281 udf_write_aext(inode, bloc, &extoffset, eloc, elen, bh, 1); 282 udf_write_aext(inode, bloc, &extoffset, eloc, elen, bh, 1);
282 } 283 }
283 memset(&eloc, 0x00, sizeof(kernel_lb_addr)); 284 memset(&eloc, 0x00, sizeof(kernel_lb_addr));
284 elen = EXT_NOT_RECORDED_NOT_ALLOCATED | offset; 285 elen = EXT_NOT_RECORDED_NOT_ALLOCATED | byte_offset;
285 udf_add_aext(inode, &bloc, &extoffset, eloc, elen, &bh, 1); 286 udf_add_aext(inode, &bloc, &extoffset, eloc, elen, &bh, 1);
286 } 287 }
287 } 288 }
diff --git a/fs/udf/udfdecl.h b/fs/udf/udfdecl.h
index ee1dece1f6f5..d3deb32b53eb 100644
--- a/fs/udf/udfdecl.h
+++ b/fs/udf/udfdecl.h
@@ -98,8 +98,8 @@ extern void udf_read_inode(struct inode *);
98extern void udf_delete_inode(struct inode *); 98extern void udf_delete_inode(struct inode *);
99extern void udf_clear_inode(struct inode *); 99extern void udf_clear_inode(struct inode *);
100extern int udf_write_inode(struct inode *, int); 100extern int udf_write_inode(struct inode *, int);
101extern long udf_block_map(struct inode *, long); 101extern long udf_block_map(struct inode *, sector_t);
102extern int8_t inode_bmap(struct inode *, int, kernel_lb_addr *, uint32_t *, kernel_lb_addr *, uint32_t *, uint32_t *, struct buffer_head **); 102extern int8_t inode_bmap(struct inode *, sector_t, kernel_lb_addr *, uint32_t *, kernel_lb_addr *, uint32_t *, sector_t *, struct buffer_head **);
103extern int8_t udf_add_aext(struct inode *, kernel_lb_addr *, int *, kernel_lb_addr, uint32_t, struct buffer_head **, int); 103extern int8_t udf_add_aext(struct inode *, kernel_lb_addr *, int *, kernel_lb_addr, uint32_t, struct buffer_head **, int);
104extern int8_t udf_write_aext(struct inode *, kernel_lb_addr, int *, kernel_lb_addr, uint32_t, struct buffer_head *, int); 104extern int8_t udf_write_aext(struct inode *, kernel_lb_addr, int *, kernel_lb_addr, uint32_t, struct buffer_head *, int);
105extern int8_t udf_delete_aext(struct inode *, kernel_lb_addr, int, kernel_lb_addr, uint32_t, struct buffer_head *); 105extern int8_t udf_delete_aext(struct inode *, kernel_lb_addr, int, kernel_lb_addr, uint32_t, struct buffer_head *);
@@ -151,7 +151,7 @@ extern int udf_new_block(struct super_block *, struct inode *, uint16_t, uint32_
151extern int udf_fsync_file(struct file *, struct dentry *, int); 151extern int udf_fsync_file(struct file *, struct dentry *, int);
152 152
153/* directory.c */ 153/* directory.c */
154extern struct fileIdentDesc * udf_fileident_read(struct inode *, loff_t *, struct udf_fileident_bh *, struct fileIdentDesc *, kernel_lb_addr *, uint32_t *, kernel_lb_addr *, uint32_t *, uint32_t *, struct buffer_head **); 154extern struct fileIdentDesc * udf_fileident_read(struct inode *, loff_t *, struct udf_fileident_bh *, struct fileIdentDesc *, kernel_lb_addr *, uint32_t *, kernel_lb_addr *, uint32_t *, sector_t *, struct buffer_head **);
155extern struct fileIdentDesc * udf_get_fileident(void * buffer, int bufsize, int * offset); 155extern struct fileIdentDesc * udf_get_fileident(void * buffer, int bufsize, int * offset);
156extern long_ad * udf_get_filelongad(uint8_t *, int, int *, int); 156extern long_ad * udf_get_filelongad(uint8_t *, int, int *, int);
157extern short_ad * udf_get_fileshortad(uint8_t *, int, int *, int); 157extern short_ad * udf_get_fileshortad(uint8_t *, int, int *, int);