diff options
author | Jan Kara <jack@suse.cz> | 2007-05-08 03:35:16 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:15:21 -0400 |
commit | 3bf25cb40d899eeb5a471f497e56ddfe2c96c019 (patch) | |
tree | 98d425edd6392d3037218851084dde6736e7ba32 /fs/udf/directory.c | |
parent | ff116fc8d1d43927c7651b91d5aec41eb30c4429 (diff) |
udf: use get_bh()
Make UDF use get_bh() instead of directly accessing b_count and use
brelse() instead of udf_release_data() which does just brelse()...
Signed-off-by: Jan Kara <jack@suse.cz>
Acked-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/udf/directory.c')
-rw-r--r-- | fs/udf/directory.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/udf/directory.c b/fs/udf/directory.c index 9f66cfe124c6..198caa33027a 100644 --- a/fs/udf/directory.c +++ b/fs/udf/directory.c | |||
@@ -36,14 +36,14 @@ udf_filead_read(struct inode *dir, uint8_t *tmpad, uint8_t ad_size, | |||
36 | 36 | ||
37 | if (!ad) | 37 | if (!ad) |
38 | { | 38 | { |
39 | udf_release_data(*bh); | 39 | brelse(*bh); |
40 | *error = 1; | 40 | *error = 1; |
41 | return NULL; | 41 | return NULL; |
42 | } | 42 | } |
43 | 43 | ||
44 | if (*offset == dir->i_sb->s_blocksize) | 44 | if (*offset == dir->i_sb->s_blocksize) |
45 | { | 45 | { |
46 | udf_release_data(*bh); | 46 | brelse(*bh); |
47 | block = udf_get_lb_pblock(dir->i_sb, fe_loc, ++*pos); | 47 | block = udf_get_lb_pblock(dir->i_sb, fe_loc, ++*pos); |
48 | if (!block) | 48 | if (!block) |
49 | return NULL; | 49 | return NULL; |
@@ -57,7 +57,7 @@ udf_filead_read(struct inode *dir, uint8_t *tmpad, uint8_t ad_size, | |||
57 | remainder = dir->i_sb->s_blocksize - loffset; | 57 | remainder = dir->i_sb->s_blocksize - loffset; |
58 | memcpy((uint8_t *)ad, (*bh)->b_data + loffset, remainder); | 58 | memcpy((uint8_t *)ad, (*bh)->b_data + loffset, remainder); |
59 | 59 | ||
60 | udf_release_data(*bh); | 60 | brelse(*bh); |
61 | block = udf_get_lb_pblock(dir->i_sb, fe_loc, ++*pos); | 61 | block = udf_get_lb_pblock(dir->i_sb, fe_loc, ++*pos); |
62 | if (!block) | 62 | if (!block) |
63 | return NULL; | 63 | return NULL; |
@@ -120,7 +120,7 @@ udf_fileident_read(struct inode *dir, loff_t *nf_pos, | |||
120 | else | 120 | else |
121 | epos->offset = lextoffset; | 121 | epos->offset = lextoffset; |
122 | 122 | ||
123 | udf_release_data(fibh->sbh); | 123 | brelse(fibh->sbh); |
124 | if (!(fibh->sbh = fibh->ebh = udf_tread(dir->i_sb, block))) | 124 | if (!(fibh->sbh = fibh->ebh = udf_tread(dir->i_sb, block))) |
125 | return NULL; | 125 | return NULL; |
126 | fibh->soffset = fibh->eoffset = 0; | 126 | fibh->soffset = fibh->eoffset = 0; |
@@ -149,7 +149,7 @@ udf_fileident_read(struct inode *dir, loff_t *nf_pos, | |||
149 | } | 149 | } |
150 | else if (fibh->sbh != fibh->ebh) | 150 | else if (fibh->sbh != fibh->ebh) |
151 | { | 151 | { |
152 | udf_release_data(fibh->sbh); | 152 | brelse(fibh->sbh); |
153 | fibh->sbh = fibh->ebh; | 153 | fibh->sbh = fibh->ebh; |
154 | } | 154 | } |
155 | 155 | ||