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 17/17] vxfs: convert vxfs_get_page to read_kmap_page
Date: Wed, 11 Apr 2007 19:49:38 -0700 [thread overview]
Message-ID: <20070412024938.27380.62718.patchbomb.py@localhost> (raw)
In-Reply-To: <20070412024938.27380.54538.patchbomb.py@localhost>
Replace vxfs_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/freevxfs/vxfs_extern.h linux-2.6.21-rc5-mm4-test/fs/freevxfs/vxfs_extern.h
--- linux-2.6.21-rc5-mm4/fs/freevxfs/vxfs_extern.h 2007-04-05 17:13:29.000000000 -0700
+++ linux-2.6.21-rc5-mm4-test/fs/freevxfs/vxfs_extern.h 2007-04-06 01:59:19.000000000 -0700
@@ -69,7 +69,6 @@ extern const struct file_operations vxfs
extern int vxfs_read_olt(struct super_block *, u_long);
/* vxfs_subr.c */
-extern struct page * vxfs_get_page(struct address_space *, u_long);
extern void vxfs_put_page(struct page *);
extern struct buffer_head * vxfs_bread(struct inode *, int);
diff -urpN -X dontdiff linux-2.6.21-rc5-mm4/fs/freevxfs/vxfs_inode.c linux-2.6.21-rc5-mm4-test/fs/freevxfs/vxfs_inode.c
--- linux-2.6.21-rc5-mm4/fs/freevxfs/vxfs_inode.c 2007-04-05 17:14:25.000000000 -0700
+++ linux-2.6.21-rc5-mm4-test/fs/freevxfs/vxfs_inode.c 2007-04-06 01:59:19.000000000 -0700
@@ -138,7 +138,7 @@ __vxfs_iget(ino_t ino, struct inode *ili
u_long offset;
offset = (ino % (PAGE_SIZE / VXFS_ISIZE)) * VXFS_ISIZE;
- pp = vxfs_get_page(ilistp->i_mapping, ino * VXFS_ISIZE / PAGE_SIZE);
+ pp = read_kmap_page(ilistp->i_mapping, ino * VXFS_ISIZE / PAGE_SIZE);
if (!IS_ERR(pp)) {
struct vxfs_inode_info *vip;
diff -urpN -X dontdiff linux-2.6.21-rc5-mm4/fs/freevxfs/vxfs_lookup.c linux-2.6.21-rc5-mm4-test/fs/freevxfs/vxfs_lookup.c
--- linux-2.6.21-rc5-mm4/fs/freevxfs/vxfs_lookup.c 2007-04-05 17:13:29.000000000 -0700
+++ linux-2.6.21-rc5-mm4-test/fs/freevxfs/vxfs_lookup.c 2007-04-06 01:59:19.000000000 -0700
@@ -125,7 +125,7 @@ vxfs_find_entry(struct inode *ip, struct
caddr_t kaddr;
struct page *pp;
- pp = vxfs_get_page(ip->i_mapping, page);
+ pp = read_kmap_page(ip->i_mapping, page);
if (IS_ERR(pp))
continue;
kaddr = (caddr_t)page_address(pp);
@@ -280,7 +280,7 @@ vxfs_readdir(struct file *fp, void *retp
caddr_t kaddr;
struct page *pp;
- pp = vxfs_get_page(ip->i_mapping, page);
+ pp = read_kmap_page(ip->i_mapping, page);
if (IS_ERR(pp))
continue;
kaddr = (caddr_t)page_address(pp);
diff -urpN -X dontdiff linux-2.6.21-rc5-mm4/fs/freevxfs/vxfs_subr.c linux-2.6.21-rc5-mm4-test/fs/freevxfs/vxfs_subr.c
--- linux-2.6.21-rc5-mm4/fs/freevxfs/vxfs_subr.c 2007-04-05 17:14:25.000000000 -0700
+++ linux-2.6.21-rc5-mm4-test/fs/freevxfs/vxfs_subr.c 2007-04-06 01:59:19.000000000 -0700
@@ -56,39 +56,6 @@ vxfs_put_page(struct page *pp)
}
/**
- * vxfs_get_page - read a page into memory.
- * @ip: inode to read from
- * @n: page number
- *
- * Description:
- * vxfs_get_page reads the @n th page of @ip into the pagecache.
- *
- * Returns:
- * The wanted page on success, else a NULL pointer.
- */
-struct page *
-vxfs_get_page(struct address_space *mapping, u_long n)
-{
- struct page * pp;
-
- pp = read_mapping_page(mapping, n, NULL);
-
- if (!IS_ERR(pp)) {
- kmap(pp);
- /** if (!PageChecked(pp)) **/
- /** vxfs_check_page(pp); **/
- if (PageError(pp))
- goto fail;
- }
-
- return (pp);
-
-fail:
- vxfs_put_page(pp);
- return ERR_PTR(-EIO);
-}
-
-/**
* vxfs_bread - read buffer for a give inode,block tuple
* @ip: inode
* @block: logical block
next prev parent reply other threads:[~2007-04-12 2:55 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 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 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 10/17] mtd: convert page_read to read_kmap_page Nate Diller
2007-04-12 2:49 ` [PATCH 5/17] hfsplus: remove redundant read_mapping_page error check Nate Diller
2007-04-12 2:49 ` [PATCH 13/17] reiser4: remove redundant read_mapping_page error checks Nate Diller
2007-04-12 2:49 ` Nate Diller [this message]
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 6/17] hfs: remove redundant read_mapping_page error check 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 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 16/17] ufs: convert ufs_get_page " Nate Diller
2007-04-12 2:49 ` [PATCH 4/17] ext2: convert ext2_get_page " Nate Diller
2007-04-12 2:49 ` [PATCH 15/17] sysv: convert dir_get_page " Nate Diller
2007-04-12 2:49 ` [PATCH 9/17] minix: " Nate Diller
2007-04-12 2:49 ` [PATCH 14/17] reiserfs: convert reiserfs_get_page " 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.62718.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.