Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ufs: use dir_pages instead of ufs_dir_pages()

dir_pages was declared in a lot of filesystems.
Use newly dir_pages() from pagemap.h

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

authored by

Fabian Frederick and committed by
Al Viro
5d754ced b57c2cb9

+4 -9
+4 -9
fs/ufs/dir.c
··· 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; ··· 253 258 int namelen = qstr->len; 254 259 unsigned reclen = UFS_DIR_REC_LEN(namelen); 255 260 unsigned long start, n; 256 - unsigned long npages = ufs_dir_pages(dir); 261 + unsigned long npages = dir_pages(dir); 257 262 struct page *page = NULL; 258 263 struct ufs_inode_info *ui = UFS_I(dir); 259 264 struct ufs_dir_entry *de; ··· 317 322 unsigned short rec_len, name_len; 318 323 struct page *page = NULL; 319 324 struct ufs_dir_entry *de; 320 - unsigned long npages = ufs_dir_pages(dir); 325 + unsigned long npages = dir_pages(dir); 321 326 unsigned long n; 322 327 char *kaddr; 323 328 loff_t pos; ··· 434 439 struct super_block *sb = inode->i_sb; 435 440 unsigned int offset = pos & ~PAGE_CACHE_MASK; 436 441 unsigned long n = pos >> PAGE_CACHE_SHIFT; 437 - unsigned long npages = ufs_dir_pages(inode); 442 + unsigned long npages = dir_pages(inode); 438 443 unsigned chunk_mask = ~(UFS_SB(sb)->s_uspi->s_dirblksize - 1); 439 444 int need_revalidate = file->f_version != inode->i_version; 440 445 unsigned flags = UFS_SB(sb)->s_flags; ··· 605 610 { 606 611 struct super_block *sb = inode->i_sb; 607 612 struct page *page = NULL; 608 - unsigned long i, npages = ufs_dir_pages(inode); 613 + unsigned long i, npages = dir_pages(inode); 609 614 610 615 for (i = 0; i < npages; i++) { 611 616 char *kaddr;