diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 16:40:27 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 16:40:27 -0400 |
| commit | c1b054d03f5b31c33eaa0b267c629b118eaf3790 (patch) | |
| tree | 9333907ca767be24fcb3667877242976c3e3c8dd /fs/udf | |
| parent | 559fb51ba7e66fe298b8355fabde1275b7def35f (diff) | |
| parent | bf4e70e54cf31dcca48d279c7f7e71328eebe749 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'fs/udf')
| -rw-r--r-- | fs/udf/namei.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/udf/namei.c b/fs/udf/namei.c index 3f6dc7112b..ac191ed7df 100644 --- a/fs/udf/namei.c +++ b/fs/udf/namei.c | |||
| @@ -159,14 +159,12 @@ udf_find_entry(struct inode *dir, struct dentry *dentry, | |||
| 159 | char *nameptr; | 159 | char *nameptr; |
| 160 | uint8_t lfi; | 160 | uint8_t lfi; |
| 161 | uint16_t liu; | 161 | uint16_t liu; |
| 162 | loff_t size = (udf_ext0_offset(dir) + dir->i_size) >> 2; | 162 | loff_t size; |
| 163 | kernel_lb_addr bloc, eloc; | 163 | kernel_lb_addr bloc, eloc; |
| 164 | uint32_t extoffset, elen, offset; | 164 | uint32_t extoffset, elen, offset; |
| 165 | struct buffer_head *bh = NULL; | 165 | struct buffer_head *bh = NULL; |
| 166 | 166 | ||
| 167 | if (!dir) | 167 | size = (udf_ext0_offset(dir) + dir->i_size) >> 2; |
| 168 | return NULL; | ||
| 169 | |||
| 170 | f_pos = (udf_ext0_offset(dir) >> 2); | 168 | f_pos = (udf_ext0_offset(dir) >> 2); |
| 171 | 169 | ||
| 172 | fibh->soffset = fibh->eoffset = (f_pos & ((dir->i_sb->s_blocksize - 1) >> 2)) << 2; | 170 | fibh->soffset = fibh->eoffset = (f_pos & ((dir->i_sb->s_blocksize - 1) >> 2)) << 2; |