From: npiggin@suse.de
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-fsdevel@vger.kernel.org,
jfs-discussion@lists.sourceforge.net, shaggy@austin.ibm.com
Subject: [patch 41/41] jfs convert to new aops.
Date: Mon, 14 May 2007 16:07:00 +1000 [thread overview]
Message-ID: <20070514060656.314277000@wotan.suse.de> (raw)
In-Reply-To: 20070514060619.689648000@wotan.suse.de
[-- Attachment #1: fs-jfs-aops.patch --]
[-- Type: text/plain, Size: 2361 bytes --]
Cc: shaggy@austin.ibm.com
Cc: jfs-discussion@lists.sourceforge.net
Cc: Linux Filesystems <linux-fsdevel@vger.kernel.org>
Signed-off-by: Nick Piggin <npiggin@suse.de>
fs/jfs/inode.c | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
Index: linux-2.6/fs/jfs/inode.c
===================================================================
--- linux-2.6.orig/fs/jfs/inode.c
+++ linux-2.6/fs/jfs/inode.c
@@ -255,7 +255,7 @@ int jfs_get_block(struct inode *ip, sect
static int jfs_writepage(struct page *page, struct writeback_control *wbc)
{
- return nobh_writepage(page, jfs_get_block, wbc);
+ return block_write_full_page(page, jfs_get_block, wbc);
}
static int jfs_writepages(struct address_space *mapping,
@@ -275,10 +275,13 @@ static int jfs_readpages(struct file *fi
return mpage_readpages(mapping, pages, nr_pages, jfs_get_block);
}
-static int jfs_prepare_write(struct file *file,
- struct page *page, unsigned from, unsigned to)
-{
- return nobh_prepare_write(page, from, to, jfs_get_block);
+static int jfs_write_begin(struct file *file, struct address_space *mapping,
+ loff_t pos, unsigned len, unsigned flags,
+ struct page **pagep, void **fsdata)
+{
+ *pagep = NULL;
+ return block_write_begin(file, mapping, pos, len, flags, pagep, fsdata,
+ jfs_get_block);
}
static sector_t jfs_bmap(struct address_space *mapping, sector_t block)
@@ -302,8 +305,8 @@ const struct address_space_operations jf
.writepage = jfs_writepage,
.writepages = jfs_writepages,
.sync_page = block_sync_page,
- .prepare_write = jfs_prepare_write,
- .commit_write = nobh_commit_write,
+ .write_begin = jfs_write_begin,
+ .write_end = generic_write_end,
.bmap = jfs_bmap,
.direct_IO = jfs_direct_IO,
};
@@ -356,7 +359,7 @@ void jfs_truncate(struct inode *ip)
{
jfs_info("jfs_truncate: size = 0x%lx", (ulong) ip->i_size);
- nobh_truncate_page(ip->i_mapping, ip->i_size);
+ block_truncate_page(ip->i_mapping, ip->i_size, jfs_get_block);
IWRITE_LOCK(ip, RDWRLOCK_NORMAL);
jfs_truncate_nolock(ip, ip->i_size);
--
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
next prev parent reply other threads:[~2007-05-14 6:07 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-14 6:06 [patch 00/41] Buffered write deadlock fix and new aops for 2.6.21-mm2 npiggin
2007-05-14 6:06 ` [patch 01/41] mm: revert KERNEL_DS buffered write optimisation npiggin
2007-05-14 6:06 ` [patch 02/41] Revert 81b0c8713385ce1b1b9058e916edcf9561ad76d6 npiggin
2007-05-14 19:06 ` Dave Jones
2007-05-14 22:45 ` Nick Piggin
2007-05-14 6:06 ` [patch 03/41] Revert 6527c2bdf1f833cc18e8f42bd97973d583e4aa83 npiggin
2007-05-14 6:06 ` [patch 04/41] mm: clean up buffered write code npiggin
2007-05-14 6:06 ` [patch 05/41] mm: debug write deadlocks npiggin
2007-05-14 6:06 ` [patch 06/41] mm: trim more holes npiggin
2007-05-14 6:06 ` [patch 07/41] mm: buffered write cleanup npiggin
2007-05-14 6:06 ` [patch 08/41] mm: write iovec cleanup npiggin
2007-05-14 6:06 ` [patch 09/41] mm: fix pagecache write deadlocks npiggin
2007-05-14 6:06 ` [patch 10/41] mm: buffered write iterator npiggin
2007-05-14 6:06 ` [patch 11/41] fs: fix data-loss on error npiggin
2007-05-14 6:06 ` [patch 12/41] fs: introduce write_begin, write_end, and perform_write aops npiggin
2007-05-14 6:06 ` [patch 13/41] mm: restore KERNEL_DS optimisations npiggin
2007-05-14 6:06 ` [patch 14/41] implement simple fs aops npiggin
2007-05-14 6:06 ` [patch 15/41] block_dev convert to new aops npiggin
2007-05-14 6:06 ` [patch 16/41] rd " npiggin
2007-05-14 6:06 ` [patch 17/41] ext2 " npiggin
2007-05-16 12:45 ` Nick Piggin
2007-05-14 6:06 ` [patch 18/41] ext3 " npiggin
2007-05-14 6:06 ` [patch 19/41] ext4 " npiggin
2007-05-14 6:06 ` [patch 20/41] xfs " npiggin
2007-05-14 6:06 ` [patch 21/41] fs: new cont helpers npiggin
2007-05-14 6:06 ` [patch 22/41] fat convert to new aops npiggin
2007-05-14 6:06 ` [patch 23/41] adfs " npiggin
2007-05-14 6:06 ` [patch 24/41] hfs " npiggin
2007-05-14 6:06 ` [patch 25/41] hfsplus " npiggin
2007-05-14 6:06 ` [patch 26/41] hpfs " npiggin
2007-05-14 6:06 ` [patch 27/41] bfs " npiggin
2007-05-14 6:06 ` [patch 28/41] qnx4 " npiggin
2007-05-14 10:37 ` Anders Larsen
2007-05-14 6:06 ` [patch 29/41] reiserfs use generic write npiggin
2007-05-14 6:06 ` [patch 30/41] reiserfs convert to new aops npiggin
2007-05-14 6:06 ` [patch 31/41] nfs " npiggin
2007-05-14 6:06 ` [patch 32/41] smb " npiggin
2007-05-14 6:06 ` [patch 33/41] GFS2 " npiggin
2007-05-14 6:06 ` [patch 34/41] fuse " npiggin
2007-05-14 6:06 ` [patch 35/41] hostfs " npiggin
2007-05-14 6:06 ` [patch 36/41] jffs2 " npiggin
2007-05-14 6:06 ` [patch 37/41] ufs " npiggin
2007-05-14 6:06 ` [patch 38/41] udf " npiggin
2007-05-14 6:06 ` [patch 39/41] sysv " npiggin
2007-05-14 6:06 ` [patch 40/41] minix " npiggin
2007-05-14 6:07 ` npiggin [this message]
[not found] ` <200705142014.27237.vs@namesys.com>
[not found] ` <20070514224042.GD5531@wotan.suse.de>
2007-05-16 17:22 ` [patch 30/41] reiserfs " Vladimir V. Saveliev
-- strict thread matches above, loose matches on Subject: below --
2007-05-25 12:21 [patch 00/41] Buffered write deadlock fix and new aops for 2.6.22-rc2-mm1 npiggin
2007-05-25 12:22 ` [patch 41/41] jfs convert to new aops npiggin
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=20070514060656.314277000@wotan.suse.de \
--to=npiggin@suse.de \
--cc=akpm@linux-foundation.org \
--cc=jfs-discussion@lists.sourceforge.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=shaggy@austin.ibm.com \
/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;
as well as URLs for NNTP newsgroup(s).