From: Nate Diller <nate.diller@gmail.com>
To: Andrew Morton <akpm@osdl.org>,
Alexander Viro <viro@zeniv.linux.org.uk>,
Christoph Hellwig <hch@infradead.org>,
Roman Zippel <zippel@linux-m68k.org>,
Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>,
David Woodhouse <dwmw2@infradead.org>,
Dave Kleikamp <shaggy@austin.ibm.com>,
Anton Altaparmakov <aia21@cantab.net>,
Evgeniy Dushistov <dushistov@mail.ru>
Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
reiserfs-dev@namesys.com
Subject: [PATCH 15/17] sysv: convert dir_get_page to read_kmap_page
Date: Wed, 11 Apr 2007 19:49:38 -0700 [thread overview]
Message-ID: <20070412024938.27380.22802.patchbomb.py@localhost> (raw)
In-Reply-To: <20070412024938.27380.54538.patchbomb.py@localhost>
Replace sysv dir_get_page() with the new read_kmap_page().
Signed-off-by: Nate Diller <nate.diller@gmail.com>
---
diff -urpN -X dontdiff linux-2.6.21-rc5-mm4/fs/sysv/dir.c linux-2.6.21-rc5-mm4-test/fs/sysv/dir.c
--- linux-2.6.21-rc5-mm4/fs/sysv/dir.c 2007-04-05 17:14:25.000000000 -0700
+++ linux-2.6.21-rc5-mm4-test/fs/sysv/dir.c 2007-04-06 01:59:19.000000000 -0700
@@ -50,15 +50,6 @@ static int dir_commit_chunk(struct page
return err;
}
-static struct page * dir_get_page(struct inode *dir, unsigned long n)
-{
- struct address_space *mapping = dir->i_mapping;
- struct page *page = read_mapping_page(mapping, n, NULL);
- if (!IS_ERR(page))
- kmap(page);
- return page;
-}
-
static int sysv_readdir(struct file * filp, void * dirent, filldir_t filldir)
{
unsigned long pos = filp->f_pos;
@@ -77,7 +68,7 @@ static int sysv_readdir(struct file * fi
for ( ; n < npages; n++, offset = 0) {
char *kaddr, *limit;
struct sysv_dir_entry *de;
- struct page *page = dir_get_page(inode, n);
+ struct page *page = read_kmap_page(inode->i_mapping, n);
if (IS_ERR(page))
continue;
@@ -149,7 +140,7 @@ struct sysv_dir_entry *sysv_find_entry(s
do {
char *kaddr;
- page = dir_get_page(dir, n);
+ page = read_kmap_page(dir->i_mapping, n);
if (!IS_ERR(page)) {
kaddr = (char*)page_address(page);
de = (struct sysv_dir_entry *) kaddr;
@@ -191,7 +182,7 @@ int sysv_add_link(struct dentry *dentry,
/* We take care of directory expansion in the same loop */
for (n = 0; n <= npages; n++) {
- page = dir_get_page(dir, n);
+ page = read_kmap_page(dir->i_mapping, n);
err = PTR_ERR(page);
if (IS_ERR(page))
goto out;
@@ -299,7 +290,7 @@ int sysv_empty_dir(struct inode * inode)
for (i = 0; i < npages; i++) {
char *kaddr;
struct sysv_dir_entry * de;
- page = dir_get_page(inode, i);
+ page = read_kmap_page(inode->i_mapping, i);
if (IS_ERR(page))
continue;
@@ -353,7 +344,7 @@ void sysv_set_link(struct sysv_dir_entry
struct sysv_dir_entry * sysv_dotdot (struct inode *dir, struct page **p)
{
- struct page *page = dir_get_page(dir, 0);
+ struct page *page = read_kmap_page(dir->i_mapping, 0);
struct sysv_dir_entry *de = NULL;
if (!IS_ERR(page)) {
next prev parent reply other threads:[~2007-04-12 2:54 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-04-12 2:49 [PATCH 0/17] fs: cleanup single page synchronous read interface Nate Diller
2007-04-12 2:49 ` [PATCH 17/17] vxfs: convert vxfs_get_page to read_kmap_page Nate Diller
2007-04-12 2:49 ` [PATCH 6/17] hfs: remove redundant read_mapping_page error check Nate Diller
2007-04-12 2:49 ` [PATCH 5/17] hfsplus: " Nate Diller
2007-04-12 2:49 ` [PATCH 2/17] fs: introduce new read_cache_page interface Nate Diller
2007-04-12 2:49 ` [PATCH 12/17] partition: remove redundant read_mapping_page error checks Nate Diller
2007-04-12 2:49 ` [PATCH 7/17] jffs2: convert jffs2_gc_fetch_page to read_cache_page Nate Diller
2007-04-12 11:40 ` Phillip Lougher
2007-04-12 18:29 ` Nate Diller
2007-04-12 18:53 ` Phillip Lougher
2007-04-15 10:52 ` David Woodhouse
2007-04-12 2:49 ` [PATCH 4/17] ext2: convert ext2_get_page to read_kmap_page Nate Diller
2007-04-12 2:49 ` [PATCH 3/17] afs: convert afs_dir_get_page " Nate Diller
2007-04-12 10:58 ` David Howells
2007-04-12 18:23 ` Nate Diller
2007-04-12 18:57 ` David Howells
2007-04-12 19:21 ` Andrew Morton
2007-04-12 19:29 ` David Howells
2007-07-16 6:05 ` Drop patch update-isdn-tree-to-use-pci_get_device.patch from -mm tree Surya Prabhakar N
2007-04-12 19:27 ` [PATCH 3/17] afs: convert afs_dir_get_page to read_kmap_page Nate Diller
2007-04-12 19:43 ` David Howells
2007-04-12 2:49 ` [PATCH 9/17] minix: convert dir_get_page " Nate Diller
2007-04-12 2:49 ` [PATCH 8/17] jfs: use locking read_mapping_page Nate Diller
2007-04-12 2:49 ` [PATCH 11/17] ntfs: convert ntfs_map_page to read_kmap_page Nate Diller
2007-04-12 2:49 ` [PATCH 14/17] reiserfs: convert reiserfs_get_page " Nate Diller
2007-04-12 2:49 ` [PATCH 10/17] mtd: convert page_read " Nate Diller
2007-04-12 2:49 ` [PATCH 16/17] ufs: convert ufs_get_page " Nate Diller
2007-04-12 2:49 ` Nate Diller [this message]
2007-04-12 2:49 ` [PATCH 1/17] cramfs: use read_mapping_page Nate Diller
2007-04-12 9:54 ` Christoph Hellwig
2007-04-12 11:26 ` Roman Zippel
2007-04-12 18:36 ` Nate Diller
2007-04-12 2:49 ` [PATCH 13/17] reiser4: remove redundant read_mapping_page error checks Nate Diller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070412024938.27380.22802.patchbomb.py@localhost \
--to=nate.diller@gmail.com \
--cc=aia21@cantab.net \
--cc=akpm@osdl.org \
--cc=dushistov@mail.ru \
--cc=dwmw2@infradead.org \
--cc=hch@infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mikulas@artax.karlin.mff.cuni.cz \
--cc=reiserfs-dev@namesys.com \
--cc=shaggy@austin.ibm.com \
--cc=viro@zeniv.linux.org.uk \
--cc=zippel@linux-m68k.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox