pagemap.h: move dir_pages() over there
authorFabian Frederick <fabf@skynet.be>
Sun, 24 May 2015 15:19:41 +0000 (17:19 +0200)
committerAl Viro <viro@zeniv.linux.org.uk>
Tue, 23 Jun 2015 22:02:00 +0000 (18:02 -0400)
That function was declared in a lot of filesystems to calculate
directory pages.

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/exofs/dir.c
fs/ext2/dir.c
fs/freevxfs/vxfs_lookup.c
fs/minix/dir.c
fs/nilfs2/dir.c
fs/qnx6/dir.c
fs/sysv/dir.c
include/linux/pagemap.h

index 4deb0b0..e5bb2ab 100644 (file)
@@ -44,12 +44,6 @@ static inline void exofs_put_page(struct page *page)
        page_cache_release(page);
 }
 
-/* Accesses dir's inode->i_size must be called under inode lock */
-static inline unsigned long dir_pages(struct inode *inode)
-{
-       return (inode->i_size + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
-}
-
 static unsigned exofs_last_byte(struct inode *inode, unsigned long page_nr)
 {
        loff_t last_byte = inode->i_size;
diff --cc fs/ext2/dir.c
Simple merge
Simple merge
diff --cc fs/minix/dir.c
Simple merge
diff --cc fs/nilfs2/dir.c
Simple merge
diff --cc fs/qnx6/dir.c
Simple merge
diff --cc fs/sysv/dir.c
Simple merge
Simple merge