| Revision | c30306fb287323591c854a0982d9fa5351859b45 (tree) |
|---|---|
| Time | 2008-02-04 00:37:45 |
| Author | dann frazier <dannf@debi...> |
| Commiter | Willy Tarreau |
ext2_readdir() filp->f_pos fix
This is a 2.4 backport of a linux-2.6 change by Jan Blunck
(old-2.6-bkcvs commit 2196b4744393d4f6c06fc4d63b98556d05b90933)
Commit log from 2.6 follows.
Signed-off-by: dann frazier <dannf@hp.com>
fs/ext2/dir.c (diff)| @@ -240,7 +240,7 @@ ext2_readdir (struct file * filp, void * dirent, filldir_t filldir) | ||
| 240 | 240 | loff_t pos = filp->f_pos; |
| 241 | 241 | struct inode *inode = filp->f_dentry->d_inode; |
| 242 | 242 | struct super_block *sb = inode->i_sb; |
| 243 | - unsigned offset = pos & ~PAGE_CACHE_MASK; | |
| 243 | + unsigned int offset = pos & ~PAGE_CACHE_MASK; | |
| 244 | 244 | unsigned long n = pos >> PAGE_CACHE_SHIFT; |
| 245 | 245 | unsigned long npages = dir_pages(inode); |
| 246 | 246 | unsigned chunk_mask = ~(ext2_chunk_size(inode)-1); |
| @@ -258,8 +258,13 @@ ext2_readdir (struct file * filp, void * dirent, filldir_t filldir) | ||
| 258 | 258 | ext2_dirent *de; |
| 259 | 259 | struct page *page = ext2_get_page(inode, n); |
| 260 | 260 | |
| 261 | - if (IS_ERR(page)) | |
| 261 | + if (IS_ERR(page)) { | |
| 262 | + ext2_error(sb, __FUNCTION__, | |
| 263 | + "bad page in #%lu", | |
| 264 | + inode->i_ino); | |
| 265 | + filp->f_pos += PAGE_CACHE_SIZE - offset; | |
| 262 | 266 | continue; |
| 267 | + } | |
| 263 | 268 | kaddr = page_address(page); |
| 264 | 269 | if (need_revalidate) { |
| 265 | 270 | offset = ext2_validate_entry(kaddr, offset, chunk_mask); |
| @@ -283,12 +288,12 @@ ext2_readdir (struct file * filp, void * dirent, filldir_t filldir) | ||
| 283 | 288 | ext2_put_page(page); |
| 284 | 289 | goto done; |
| 285 | 290 | } |
| 291 | + filp->f_pos += le16_to_cpu(de->rec_len); | |
| 286 | 292 | } |
| 287 | 293 | ext2_put_page(page); |
| 288 | 294 | } |
| 289 | 295 | |
| 290 | 296 | done: |
| 291 | - filp->f_pos = (n << PAGE_CACHE_SHIFT) | offset; | |
| 292 | 297 | filp->f_version = inode->i_version; |
| 293 | 298 | UPDATE_ATIME(inode); |
| 294 | 299 | return 0; |
Linux Kernel Documents
Fork