dir_pages was declared in a lot of filesystems. Use newly dir_pages() from pagemap.h
Unified · Split
| @@ -65,11 +65,6 @@ static inline void ufs_put_page(struct page *page) · 64 unmodified lines | ||
| 65 | 65 | page_cache_release(page); |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | −static inline unsigned long ufs_dir_pages(struct inode *inode) | |
| 69 | −{ | |
| 70 | − return (inode->i_size+PAGE_CACHE_SIZE-1)>>PAGE_CACHE_SHIFT; | |
| 71 | −} | |
| 72 | − | |
| 73 | 68 | ino_t ufs_inode_by_name(struct inode *dir, const struct qstr *qstr) |
| 74 | 69 | { |
| 75 | 70 | ino_t res = 0; |
| @@ -258,7 +253,7 @@ struct ufs_dir_entry *ufs_find_entry(struct inode *dir, const struct qstr *qstr, · 182 unmodified lines | ||
| 258 | 253 | int namelen = qstr->len; |
| 259 | 254 | unsigned reclen = UFS_DIR_REC_LEN(namelen); |
| 260 | 255 | unsigned long start, n; |
| 261 | − unsigned long npages = ufs_dir_pages(dir); | |
| 256 | + unsigned long npages = dir_pages(dir); | |
| 262 | 257 | struct page *page = NULL; |
| 263 | 258 | struct ufs_inode_info *ui = UFS_I(dir); |
| 264 | 259 | struct ufs_dir_entry *de; |
| @@ -322,7 +317,7 @@ int ufs_add_link(struct dentry *dentry, struct inode *inode) · 57 unmodified lines | ||
| 322 | 317 | unsigned short rec_len, name_len; |
| 323 | 318 | struct page *page = NULL; |
| 324 | 319 | struct ufs_dir_entry *de; |
| 325 | − unsigned long npages = ufs_dir_pages(dir); | |
| 320 | + unsigned long npages = dir_pages(dir); | |
| 326 | 321 | unsigned long n; |
| 327 | 322 | char *kaddr; |
| 328 | 323 | loff_t pos; |
| @@ -439,7 +434,7 @@ ufs_readdir(struct file *file, struct dir_context *ctx) · 110 unmodified lines | ||
| 439 | 434 | struct super_block *sb = inode->i_sb; |
| 440 | 435 | unsigned int offset = pos & ~PAGE_CACHE_MASK; |
| 441 | 436 | unsigned long n = pos >> PAGE_CACHE_SHIFT; |
| 442 | − unsigned long npages = ufs_dir_pages(inode); | |
| 437 | + unsigned long npages = dir_pages(inode); | |
| 443 | 438 | unsigned chunk_mask = ~(UFS_SB(sb)->s_uspi->s_dirblksize - 1); |
| 444 | 439 | int need_revalidate = file->f_version != inode->i_version; |
| 445 | 440 | unsigned flags = UFS_SB(sb)->s_flags; |
| @@ -610,7 +605,7 @@ int ufs_empty_dir(struct inode * inode) · 164 unmodified lines | ||
| 610 | 605 | { |
| 611 | 606 | struct super_block *sb = inode->i_sb; |
| 612 | 607 | struct page *page = NULL; |
| 613 | − unsigned long i, npages = ufs_dir_pages(inode); | |
| 608 | + unsigned long i, npages = dir_pages(inode); | |
| 614 | 609 | |
| 615 | 610 | for (i = 0; i < npages; i++) { |
| 616 | 611 | char *kaddr; |