On Sun, 24 May 2015 17:19:42 +0200, Fabian Frederick <fabf@xxxxxxxxx> wrote: > dir_pages() is now declared in pagemap.h > > Signed-off-by: Fabian Frederick <fabf@xxxxxxxxx> > --- > fs/nilfs2/dir.c | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/fs/nilfs2/dir.c b/fs/nilfs2/dir.c > index 0ee0bed..6b8b92b 100644 > --- a/fs/nilfs2/dir.c > +++ b/fs/nilfs2/dir.c > @@ -61,11 +61,6 @@ static inline void nilfs_put_page(struct page *page) > page_cache_release(page); > } > > -static inline unsigned long dir_pages(struct inode *inode) > -{ > - return (inode->i_size+PAGE_CACHE_SIZE-1)>>PAGE_CACHE_SHIFT; > -} > - Can you include this and similar changes in the first patch "pagemap.h: declare dir_pages()" ? The first patch transiently breaks build because it inserts a duplicate definition of the dir_pages() inline function until it gets removed from each file system by the successive patches. This series looks non-divisible except the patch of ufs. Regards, Ryusuke Konishi > /* > * Return the offset into page `page_nr' of the last valid > * byte in that page, plus one. > -- > 2.4.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html