diff options
Diffstat (limited to 'fs/ext3/dir.c')
| -rw-r--r-- | fs/ext3/dir.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/ext3/dir.c b/fs/ext3/dir.c index fbb0d4ed07d4..6f9e5a523c87 100644 --- a/fs/ext3/dir.c +++ b/fs/ext3/dir.c | |||
| @@ -59,7 +59,7 @@ static unsigned char get_dtype(struct super_block *sb, int filetype) | |||
| 59 | 59 | ||
| 60 | return (ext3_filetype_table[filetype]); | 60 | return (ext3_filetype_table[filetype]); |
| 61 | } | 61 | } |
| 62 | 62 | ||
| 63 | 63 | ||
| 64 | int ext3_check_dir_entry (const char * function, struct inode * dir, | 64 | int ext3_check_dir_entry (const char * function, struct inode * dir, |
| 65 | struct ext3_dir_entry_2 * de, | 65 | struct ext3_dir_entry_2 * de, |
| @@ -162,7 +162,7 @@ revalidate: | |||
| 162 | * to make sure. */ | 162 | * to make sure. */ |
| 163 | if (filp->f_version != inode->i_version) { | 163 | if (filp->f_version != inode->i_version) { |
| 164 | for (i = 0; i < sb->s_blocksize && i < offset; ) { | 164 | for (i = 0; i < sb->s_blocksize && i < offset; ) { |
| 165 | de = (struct ext3_dir_entry_2 *) | 165 | de = (struct ext3_dir_entry_2 *) |
| 166 | (bh->b_data + i); | 166 | (bh->b_data + i); |
| 167 | /* It's too expensive to do a full | 167 | /* It's too expensive to do a full |
| 168 | * dirent test each time round this | 168 | * dirent test each time round this |
| @@ -181,7 +181,7 @@ revalidate: | |||
| 181 | filp->f_version = inode->i_version; | 181 | filp->f_version = inode->i_version; |
| 182 | } | 182 | } |
| 183 | 183 | ||
| 184 | while (!error && filp->f_pos < inode->i_size | 184 | while (!error && filp->f_pos < inode->i_size |
| 185 | && offset < sb->s_blocksize) { | 185 | && offset < sb->s_blocksize) { |
| 186 | de = (struct ext3_dir_entry_2 *) (bh->b_data + offset); | 186 | de = (struct ext3_dir_entry_2 *) (bh->b_data + offset); |
| 187 | if (!ext3_check_dir_entry ("ext3_readdir", inode, de, | 187 | if (!ext3_check_dir_entry ("ext3_readdir", inode, de, |
| @@ -229,7 +229,7 @@ out: | |||
| 229 | /* | 229 | /* |
| 230 | * These functions convert from the major/minor hash to an f_pos | 230 | * These functions convert from the major/minor hash to an f_pos |
| 231 | * value. | 231 | * value. |
| 232 | * | 232 | * |
| 233 | * Currently we only use major hash numer. This is unfortunate, but | 233 | * Currently we only use major hash numer. This is unfortunate, but |
| 234 | * on 32-bit machines, the same VFS interface is used for lseek and | 234 | * on 32-bit machines, the same VFS interface is used for lseek and |
| 235 | * llseek, so if we use the 64 bit offset, then the 32-bit versions of | 235 | * llseek, so if we use the 64 bit offset, then the 32-bit versions of |
| @@ -250,7 +250,7 @@ out: | |||
| 250 | struct fname { | 250 | struct fname { |
| 251 | __u32 hash; | 251 | __u32 hash; |
| 252 | __u32 minor_hash; | 252 | __u32 minor_hash; |
| 253 | struct rb_node rb_hash; | 253 | struct rb_node rb_hash; |
| 254 | struct fname *next; | 254 | struct fname *next; |
| 255 | __u32 inode; | 255 | __u32 inode; |
| 256 | __u8 name_len; | 256 | __u8 name_len; |
| @@ -410,7 +410,7 @@ static int call_filldir(struct file * filp, void * dirent, | |||
| 410 | curr_pos = hash2pos(fname->hash, fname->minor_hash); | 410 | curr_pos = hash2pos(fname->hash, fname->minor_hash); |
| 411 | while (fname) { | 411 | while (fname) { |
| 412 | error = filldir(dirent, fname->name, | 412 | error = filldir(dirent, fname->name, |
| 413 | fname->name_len, curr_pos, | 413 | fname->name_len, curr_pos, |
| 414 | fname->inode, | 414 | fname->inode, |
| 415 | get_dtype(sb, fname->file_type)); | 415 | get_dtype(sb, fname->file_type)); |
| 416 | if (error) { | 416 | if (error) { |
| @@ -465,7 +465,7 @@ static int ext3_dx_readdir(struct file * filp, | |||
| 465 | /* | 465 | /* |
| 466 | * Fill the rbtree if we have no more entries, | 466 | * Fill the rbtree if we have no more entries, |
| 467 | * or the inode has changed since we last read in the | 467 | * or the inode has changed since we last read in the |
| 468 | * cached entries. | 468 | * cached entries. |
| 469 | */ | 469 | */ |
| 470 | if ((!info->curr_node) || | 470 | if ((!info->curr_node) || |
| 471 | (filp->f_version != inode->i_version)) { | 471 | (filp->f_version != inode->i_version)) { |
