git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
fs
/
udf
/
directory.c
diff --git
a/fs/udf/directory.c
b/fs/udf/directory.c
index
9a61ecc
..
198caa3
100644
(file)
--- a/
fs/udf/directory.c
+++ b/
fs/udf/directory.c
@@
-4,11
+4,6
@@
* PURPOSE
* Directory related functions
*
* PURPOSE
* Directory related functions
*
- * CONTACTS
- * E-mail regarding any portion of the Linux UDF file system should be
- * directed to the development team mailing list (run by majordomo):
- * linux_udf@hpesjro.fc.hp.com
- *
* COPYRIGHT
* This file is distributed under the terms of the GNU General Public
* License (GPL). Copies of the GPL can be obtained from:
* COPYRIGHT
* This file is distributed under the terms of the GNU General Public
* License (GPL). Copies of the GPL can be obtained from:
@@
-41,14
+36,14
@@
udf_filead_read(struct inode *dir, uint8_t *tmpad, uint8_t ad_size,
if (!ad)
{
if (!ad)
{
-
udf_release_data
(*bh);
+
brelse
(*bh);
*error = 1;
return NULL;
}
if (*offset == dir->i_sb->s_blocksize)
{
*error = 1;
return NULL;
}
if (*offset == dir->i_sb->s_blocksize)
{
-
udf_release_data
(*bh);
+
brelse
(*bh);
block = udf_get_lb_pblock(dir->i_sb, fe_loc, ++*pos);
if (!block)
return NULL;
block = udf_get_lb_pblock(dir->i_sb, fe_loc, ++*pos);
if (!block)
return NULL;
@@
-62,7
+57,7
@@
udf_filead_read(struct inode *dir, uint8_t *tmpad, uint8_t ad_size,
remainder = dir->i_sb->s_blocksize - loffset;
memcpy((uint8_t *)ad, (*bh)->b_data + loffset, remainder);
remainder = dir->i_sb->s_blocksize - loffset;
memcpy((uint8_t *)ad, (*bh)->b_data + loffset, remainder);
-
udf_release_data
(*bh);
+
brelse
(*bh);
block = udf_get_lb_pblock(dir->i_sb, fe_loc, ++*pos);
if (!block)
return NULL;
block = udf_get_lb_pblock(dir->i_sb, fe_loc, ++*pos);
if (!block)
return NULL;
@@
-80,9
+75,9
@@
struct fileIdentDesc *
udf_fileident_read(struct inode *dir, loff_t *nf_pos,
struct udf_fileident_bh *fibh,
struct fileIdentDesc *cfi,
udf_fileident_read(struct inode *dir, loff_t *nf_pos,
struct udf_fileident_bh *fibh,
struct fileIdentDesc *cfi,
- kernel_lb_addr *bloc, uint32_t *extoffset,
+ struct extent_position *epos,
kernel_lb_addr *eloc, uint32_t *elen,
kernel_lb_addr *eloc, uint32_t *elen,
-
uint32_t *offset, struct buffer_head **bh
)
+
sector_t *offset
)
{
struct fileIdentDesc *fi;
int i, num, block;
{
struct fileIdentDesc *fi;
int i, num, block;
@@
-110,13
+105,11
@@
udf_fileident_read(struct inode *dir, loff_t *nf_pos,
if (fibh->eoffset == dir->i_sb->s_blocksize)
{
if (fibh->eoffset == dir->i_sb->s_blocksize)
{
- int lextoffset =
*ext
offset;
+ int lextoffset =
epos->
offset;
- if (udf_next_aext(dir,
bloc, extoffset, eloc, elen, bh
, 1) !=
+ if (udf_next_aext(dir,
epos, eloc, elen
, 1) !=
(EXT_RECORDED_ALLOCATED >> 30))
(EXT_RECORDED_ALLOCATED >> 30))
- {
return NULL;
return NULL;
- }
block = udf_get_lb_pblock(dir->i_sb, *eloc, *offset);
block = udf_get_lb_pblock(dir->i_sb, *eloc, *offset);
@@
-125,9
+118,9
@@
udf_fileident_read(struct inode *dir, loff_t *nf_pos,
if ((*offset << dir->i_sb->s_blocksize_bits) >= *elen)
*offset = 0;
else
if ((*offset << dir->i_sb->s_blocksize_bits) >= *elen)
*offset = 0;
else
-
*ext
offset = lextoffset;
+
epos->
offset = lextoffset;
-
udf_release_data
(fibh->sbh);
+
brelse
(fibh->sbh);
if (!(fibh->sbh = fibh->ebh = udf_tread(dir->i_sb, block)))
return NULL;
fibh->soffset = fibh->eoffset = 0;
if (!(fibh->sbh = fibh->ebh = udf_tread(dir->i_sb, block)))
return NULL;
fibh->soffset = fibh->eoffset = 0;
@@
-156,7
+149,7
@@
udf_fileident_read(struct inode *dir, loff_t *nf_pos,
}
else if (fibh->sbh != fibh->ebh)
{
}
else if (fibh->sbh != fibh->ebh)
{
-
udf_release_data
(fibh->sbh);
+
brelse
(fibh->sbh);
fibh->sbh = fibh->ebh;
}
fibh->sbh = fibh->ebh;
}
@@
-174,13
+167,11
@@
udf_fileident_read(struct inode *dir, loff_t *nf_pos,
}
else if (fibh->eoffset > dir->i_sb->s_blocksize)
{
}
else if (fibh->eoffset > dir->i_sb->s_blocksize)
{
- int lextoffset =
*ext
offset;
+ int lextoffset =
epos->
offset;
- if (udf_next_aext(dir,
bloc, extoffset, eloc, elen, bh
, 1) !=
+ if (udf_next_aext(dir,
epos, eloc, elen
, 1) !=
(EXT_RECORDED_ALLOCATED >> 30))
(EXT_RECORDED_ALLOCATED >> 30))
- {
return NULL;
return NULL;
- }
block = udf_get_lb_pblock(dir->i_sb, *eloc, *offset);
block = udf_get_lb_pblock(dir->i_sb, *eloc, *offset);
@@
-189,7
+180,7
@@
udf_fileident_read(struct inode *dir, loff_t *nf_pos,
if ((*offset << dir->i_sb->s_blocksize_bits) >= *elen)
*offset = 0;
else
if ((*offset << dir->i_sb->s_blocksize_bits) >= *elen)
*offset = 0;
else
-
*ext
offset = lextoffset;
+
epos->
offset = lextoffset;
fibh->soffset -= dir->i_sb->s_blocksize;
fibh->eoffset -= dir->i_sb->s_blocksize;
fibh->soffset -= dir->i_sb->s_blocksize;
fibh->eoffset -= dir->i_sb->s_blocksize;