From: npiggin@suse.de
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org
Subject: [patch 17/41] ext2 convert to new aops.
Date: Mon, 14 May 2007 16:06:36 +1000 [thread overview]
Message-ID: <20070514060652.572496000@wotan.suse.de> (raw)
In-Reply-To: 20070514060619.689648000@wotan.suse.de
[-- Attachment #1: fs-ext2-aops.patch --]
[-- Type: text/plain, Size: 7181 bytes --]
Cc: linux-ext4@vger.kernel.org
Cc: Linux Filesystems <linux-fsdevel@vger.kernel.org>
Signed-off-by: Nick Piggin <npiggin@suse.de>
fs/ext2/dir.c | 47 +++++++++++++++++++++++++++++------------------
fs/ext2/ext2.h | 3 +++
fs/ext2/inode.c | 24 +++++++++++++-----------
3 files changed, 45 insertions(+), 29 deletions(-)
Index: linux-2.6/fs/ext2/inode.c
===================================================================
--- linux-2.6.orig/fs/ext2/inode.c
+++ linux-2.6/fs/ext2/inode.c
@@ -726,18 +726,21 @@ ext2_readpages(struct file *file, struct
return mpage_readpages(mapping, pages, nr_pages, ext2_get_block);
}
-static int
-ext2_prepare_write(struct file *file, struct page *page,
- unsigned from, unsigned to)
+int __ext2_write_begin(struct file *file, struct address_space *mapping,
+ loff_t pos, unsigned len, unsigned flags,
+ struct page **pagep, void **fsdata)
{
- return block_prepare_write(page,from,to,ext2_get_block);
+ return block_write_begin(file, mapping, pos, len, flags, pagep, fsdata,
+ ext2_get_block);
}
static int
-ext2_nobh_prepare_write(struct file *file, struct page *page,
- unsigned from, unsigned to)
+ext2_write_begin(struct file *file, struct address_space *mapping,
+ loff_t pos, unsigned len, unsigned flags,
+ struct page **pagep, void **fsdata)
{
- return nobh_prepare_write(page,from,to,ext2_get_block);
+ *pagep = NULL;
+ return __ext2_write_begin(file, mapping, pos, len, flags, pagep,fsdata);
}
static int ext2_nobh_writepage(struct page *page,
@@ -773,8 +776,8 @@ const struct address_space_operations ex
.readpages = ext2_readpages,
.writepage = ext2_writepage,
.sync_page = block_sync_page,
- .prepare_write = ext2_prepare_write,
- .commit_write = generic_commit_write,
+ .write_begin = ext2_write_begin,
+ .write_end = generic_write_end,
.bmap = ext2_bmap,
.direct_IO = ext2_direct_IO,
.writepages = ext2_writepages,
@@ -791,8 +794,7 @@ const struct address_space_operations ex
.readpages = ext2_readpages,
.writepage = ext2_nobh_writepage,
.sync_page = block_sync_page,
- .prepare_write = ext2_nobh_prepare_write,
- .commit_write = nobh_commit_write,
+ /* XXX: todo */
.bmap = ext2_bmap,
.direct_IO = ext2_direct_IO,
.writepages = ext2_writepages,
Index: linux-2.6/fs/ext2/dir.c
===================================================================
--- linux-2.6.orig/fs/ext2/dir.c
+++ linux-2.6/fs/ext2/dir.c
@@ -22,6 +22,7 @@
*/
#include "ext2.h"
+#include <linux/buffer_head.h>
#include <linux/pagemap.h>
typedef struct ext2_dir_entry_2 ext2_dirent;
@@ -61,12 +62,14 @@ ext2_last_byte(struct inode *inode, unsi
return last_byte;
}
-static int ext2_commit_chunk(struct page *page, unsigned from, unsigned to)
+static int ext2_commit_chunk(struct page *page, loff_t pos, unsigned len)
{
- struct inode *dir = page->mapping->host;
+ struct address_space *mapping = page->mapping;
+ struct inode *dir = mapping->host;
int err = 0;
+
dir->i_version++;
- page->mapping->a_ops->commit_write(NULL, page, from, to);
+ block_write_end(NULL, mapping, pos, len, len, page, NULL);
if (IS_DIRSYNC(dir))
err = write_one_page(page, 1);
else
@@ -412,16 +415,18 @@ ino_t ext2_inode_by_name(struct inode *
void ext2_set_link(struct inode *dir, struct ext2_dir_entry_2 *de,
struct page *page, struct inode *inode)
{
- unsigned from = (char *) de - (char *) page_address(page);
- unsigned to = from + le16_to_cpu(de->rec_len);
+ loff_t pos = (page->index << PAGE_CACHE_SHIFT) +
+ (char *) de - (char *) page_address(page);
+ unsigned len = le16_to_cpu(de->rec_len);
int err;
lock_page(page);
- err = page->mapping->a_ops->prepare_write(NULL, page, from, to);
+ err = __ext2_write_begin(NULL, page->mapping, pos, len,
+ AOP_FLAG_UNINTERRUPTIBLE, &page, NULL);
BUG_ON(err);
de->inode = cpu_to_le32(inode->i_ino);
- ext2_set_de_type (de, inode);
- err = ext2_commit_chunk(page, from, to);
+ ext2_set_de_type(de, inode);
+ err = ext2_commit_chunk(page, pos, len);
ext2_put_page(page);
dir->i_mtime = dir->i_ctime = CURRENT_TIME_SEC;
EXT2_I(dir)->i_flags &= ~EXT2_BTREE_FL;
@@ -444,7 +449,7 @@ int ext2_add_link (struct dentry *dentry
unsigned long npages = dir_pages(dir);
unsigned long n;
char *kaddr;
- unsigned from, to;
+ loff_t pos;
int err;
/*
@@ -497,9 +502,10 @@ int ext2_add_link (struct dentry *dentry
return -EINVAL;
got_it:
- from = (char*)de - (char*)page_address(page);
- to = from + rec_len;
- err = page->mapping->a_ops->prepare_write(NULL, page, from, to);
+ pos = (page->index << PAGE_CACHE_SHIFT) +
+ (char*)de - (char*)page_address(page);
+ err = __ext2_write_begin(NULL, page->mapping, pos, rec_len, 0,
+ &page, NULL);
if (err)
goto out_unlock;
if (de->inode) {
@@ -509,10 +515,10 @@ got_it:
de = de1;
}
de->name_len = namelen;
- memcpy (de->name, name, namelen);
+ memcpy(de->name, name, namelen);
de->inode = cpu_to_le32(inode->i_ino);
ext2_set_de_type (de, inode);
- err = ext2_commit_chunk(page, from, to);
+ err = ext2_commit_chunk(page, pos, rec_len);
dir->i_mtime = dir->i_ctime = CURRENT_TIME_SEC;
EXT2_I(dir)->i_flags &= ~EXT2_BTREE_FL;
mark_inode_dirty(dir);
@@ -537,6 +543,7 @@ int ext2_delete_entry (struct ext2_dir_e
char *kaddr = page_address(page);
unsigned from = ((char*)dir - kaddr) & ~(ext2_chunk_size(inode)-1);
unsigned to = ((char*)dir - kaddr) + le16_to_cpu(dir->rec_len);
+ loff_t pos;
ext2_dirent * pde = NULL;
ext2_dirent * de = (ext2_dirent *) (kaddr + from);
int err;
@@ -553,13 +560,15 @@ int ext2_delete_entry (struct ext2_dir_e
}
if (pde)
from = (char*)pde - (char*)page_address(page);
+ pos = (page->index << PAGE_CACHE_SHIFT) + from;
lock_page(page);
- err = mapping->a_ops->prepare_write(NULL, page, from, to);
+ err = __ext2_write_begin(NULL, page->mapping, pos, to - from, 0,
+ &page, NULL);
BUG_ON(err);
if (pde)
- pde->rec_len = cpu_to_le16(to-from);
+ pde->rec_len = cpu_to_le16(to - from);
dir->inode = 0;
- err = ext2_commit_chunk(page, from, to);
+ err = ext2_commit_chunk(page, pos, to - from);
inode->i_ctime = inode->i_mtime = CURRENT_TIME_SEC;
EXT2_I(inode)->i_flags &= ~EXT2_BTREE_FL;
mark_inode_dirty(inode);
@@ -582,7 +591,9 @@ int ext2_make_empty(struct inode *inode,
if (!page)
return -ENOMEM;
- err = mapping->a_ops->prepare_write(NULL, page, 0, chunk_size);
+
+ err = __ext2_write_begin(NULL, page->mapping, 0, chunk_size, 0,
+ &page, NULL);
if (err) {
unlock_page(page);
goto fail;
Index: linux-2.6/fs/ext2/ext2.h
===================================================================
--- linux-2.6.orig/fs/ext2/ext2.h
+++ linux-2.6/fs/ext2/ext2.h
@@ -134,6 +134,9 @@ extern void ext2_truncate (struct inode
extern int ext2_setattr (struct dentry *, struct iattr *);
extern void ext2_set_inode_flags(struct inode *inode);
extern void ext2_get_inode_flags(struct ext2_inode_info *);
+int __ext2_write_begin(struct file *file, struct address_space *mapping,
+ loff_t pos, unsigned len, unsigned flags,
+ struct page **pagep, void **fsdata);
/* ioctl.c */
extern int ext2_ioctl (struct inode *, struct file *, unsigned int,
--
next prev parent reply other threads:[~2007-05-14 6:06 UTC|newest]
Thread overview: 47+ 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 ` npiggin [this message]
2007-05-16 12:45 ` [patch 17/41] ext2 " 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 ` [patch 41/41] jfs " npiggin
[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
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=20070514060652.572496000@wotan.suse.de \
--to=npiggin@suse.de \
--cc=akpm@linux-foundation.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).