clean up write_begin usage for directories in pagecache

[net-next-2.6.git] / fs / sysv / dir.c

diff --git a/fs/sysv/dir.c b/fs/sysv/dir.c
index 79941e4964a4eda4b1a55255fddbc2b6e1d853ef..a77c421576209174bf3d649a4370e33e0cbe4e79 100644 (file)
--- a/fs/sysv/dir.c
+++ b/fs/sysv/dir.c
@@ -218,8 +218,7 @@ got_it:
        pos = page_offset(page) +
                        (char*)de - (char*)page_address(page);
        lock_page(page);
-       err = __sysv_write_begin(NULL, page->mapping, pos, SYSV_DIRSIZE,
-                               AOP_FLAG_UNINTERRUPTIBLE, &page, NULL);
+       err = sysv_prepare_chunk(page, pos, SYSV_DIRSIZE);
        if (err)
                goto out_unlock;
        memcpy (de->name, name, namelen);
@@ -239,15 +238,13 @@ out_unlock:
 
 int sysv_delete_entry(struct sysv_dir_entry *de, struct page *page)
 {
-       struct address_space *mapping = page->mapping;
-       struct inode *inode = (struct inode*)mapping->host;
+       struct inode *inode = page->mapping->host;
        char *kaddr = (char*)page_address(page);
        loff_t pos = page_offset(page) + (char *)de - kaddr;
        int err;
 
        lock_page(page);
-       err = __sysv_write_begin(NULL, mapping, pos, SYSV_DIRSIZE,
-                               AOP_FLAG_UNINTERRUPTIBLE, &page, NULL);
+       err = sysv_prepare_chunk(page, pos, SYSV_DIRSIZE);
        BUG_ON(err);
        de->inode = 0;
        err = dir_commit_chunk(page, pos, SYSV_DIRSIZE);
@@ -259,16 +256,14 @@ int sysv_delete_entry(struct sysv_dir_entry *de, struct page *page)
 
 int sysv_make_empty(struct inode *inode, struct inode *dir)
 {
-       struct address_space *mapping = inode->i_mapping;
-       struct page *page = grab_cache_page(mapping, 0);
+       struct page *page = grab_cache_page(inode->i_mapping, 0);
        struct sysv_dir_entry * de;
        char *base;
        int err;
 
        if (!page)
                return -ENOMEM;
-       err = __sysv_write_begin(NULL, mapping, 0, 2 * SYSV_DIRSIZE,
-                               AOP_FLAG_UNINTERRUPTIBLE, &page, NULL);
+       err = sysv_prepare_chunk(page, 0, 2 * SYSV_DIRSIZE);
        if (err) {
                unlock_page(page);
                goto fail;
@@ -341,15 +336,13 @@ not_empty:
 void sysv_set_link(struct sysv_dir_entry *de, struct page *page,
        struct inode *inode)
 {
-       struct address_space *mapping = page->mapping;
-       struct inode *dir = mapping->host;
+       struct inode *dir = page->mapping->host;
        loff_t pos = page_offset(page) +
                        (char *)de-(char*)page_address(page);
        int err;
 
        lock_page(page);
-       err = __sysv_write_begin(NULL, mapping, pos, SYSV_DIRSIZE,
-                               AOP_FLAG_UNINTERRUPTIBLE, &page, NULL);
+       err = sysv_prepare_chunk(page, pos, SYSV_DIRSIZE);
        BUG_ON(err);
        de->inode = cpu_to_fs16(SYSV_SB(inode->i_sb), inode->i_ino);
        err = dir_commit_chunk(page, pos, SYSV_DIRSIZE);