2015-05-24 15:19:40

by Fabian Frédérick

[permalink] [raw]
Subject: [PATCH 0/9 linux-next] move dir_pages() to pagemap.h

This small patchset declares dir_pages() in pagemap.h and
removes declarations in each filesystems.

Fabian Frederick (9):
pagemap.h: declare dir_pages()
nilfs2: remove dir_pages() declaration
ufs: use dir_pages instead of ufs_dir_pages()
fs/qnx6: remove dir_pages() declaration
ext2: remove dir_pages() declaration
minix: remove dir_pages() declaration
exofs: remove dir_pages() declaration
sysv: remove dir_pages() declaration
fs/freevxfs/vxfs_lookup.c: remove dir_pages() declaration

fs/exofs/dir.c | 6 ------
fs/ext2/dir.c | 5 -----
fs/freevxfs/vxfs_lookup.c | 7 -------
fs/minix/dir.c | 5 -----
fs/nilfs2/dir.c | 5 -----
fs/qnx6/dir.c | 5 -----
fs/sysv/dir.c | 5 -----
fs/ufs/dir.c | 13 ++++---------
include/linux/pagemap.h | 6 ++++++
9 files changed, 10 insertions(+), 47 deletions(-)

--
2.4.1


2015-05-24 15:19:45

by Fabian Frédérick

[permalink] [raw]
Subject: [PATCH 5/9 linux-next] ext2: remove dir_pages() declaration

dir_pages() is now declared in pagemap.h

Signed-off-by: Fabian Frederick <[email protected]>
---
fs/ext2/dir.c | 5 -----
1 file changed, 5 deletions(-)

diff --git a/fs/ext2/dir.c b/fs/ext2/dir.c
index 796b491..0c6638b 100644
--- a/fs/ext2/dir.c
+++ b/fs/ext2/dir.c
@@ -70,11 +70,6 @@ static inline void ext2_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;
-}
-
/*
* Return the offset into page `page_nr' of the last valid
* byte in that page, plus one.
--
2.4.1

2015-06-05 14:43:44

by Al Viro

[permalink] [raw]
Subject: Re: [PATCH 0/9 linux-next] move dir_pages() to pagemap.h

On Sun, May 24, 2015 at 05:19:40PM +0200, Fabian Frederick wrote:
> This small patchset declares dir_pages() in pagemap.h and
> removes declarations in each filesystems.

Applied, with #2 and #4--9 folded into #1 - otherwise you get build breakage.