Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[sfrench/cifs-2.6.git] / fs / ufs / dir.c

diff --git a/fs/ufs/dir.c b/fs/ufs/dir.c
index 4890ddf1518e347a45ef00bc451b55891022ff10..aaf2878305ceb6b0108ebb5a0ea832504cd43e54 100644 (file)
--- a/fs/ufs/dir.c
+++ b/fs/ufs/dir.c
@@ -19,8 +19,9 @@
 #include <linux/time.h>
 #include <linux/fs.h>
 #include <linux/ufs_fs.h>
-#include <linux/smp_lock.h>
+#include <linux/swap.h>
 
+#include "ufs.h"
 #include "swab.h"
 #include "util.h"
 
@@ -39,12 +40,18 @@ static inline int ufs_match(struct super_block *sb, int len,
        return !memcmp(name, de->d_name, len);
 }
 
-static int ufs_commit_chunk(struct page *page, unsigned from, unsigned to)
+static int ufs_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 (pos+len > dir->i_size) {
+               i_size_write(dir, pos+len);
+               mark_inode_dirty(dir);
+       }
        if (IS_DIRSYNC(dir))
                err = write_one_page(page, 1);
        else
@@ -82,16 +89,20 @@ ino_t ufs_inode_by_name(struct inode *dir, struct dentry *dentry)
 void ufs_set_link(struct inode *dir, struct ufs_dir_entry *de,
                  struct page *page, struct inode *inode)
 {
-       unsigned from = (char *) de - (char *) page_address(page);
-       unsigned to = from + fs16_to_cpu(dir->i_sb, de->d_reclen);
+       loff_t pos = page_offset(page) +
+                       (char *) de - (char *) page_address(page);
+       unsigned len = fs16_to_cpu(dir->i_sb, de->d_reclen);
        int err;
 
        lock_page(page);
-       err = page->mapping->a_ops->prepare_write(NULL, page, from, to);
+       err = __ufs_write_begin(NULL, page->mapping, pos, len,
+                               AOP_FLAG_UNINTERRUPTIBLE, &page, NULL);
        BUG_ON(err);
+
        de->d_ino = cpu_to_fs32(dir->i_sb, inode->i_ino);
        ufs_set_de_type(dir->i_sb, de, inode->i_mode);
-       err = ufs_commit_chunk(page, from, to);
+
+       err = ufs_commit_chunk(page, pos, len);
        ufs_put_page(page);
        dir->i_mtime = dir->i_ctime = CURRENT_TIME_SEC;
        mark_inode_dirty(dir);
@@ -168,7 +179,7 @@ bad_entry:
        goto fail;
 Eend:
        p = (struct ufs_dir_entry *)(kaddr + offs);
-       ufs_error (sb, "ext2_check_page",
+       ufs_error(sb, __FUNCTION__,
                   "entry in directory #%lu spans the page boundary"
                   "offset=%lu",
                   dir->i_ino, (page->index<<PAGE_CACHE_SHIFT)+offs);
@@ -180,13 +191,9 @@ fail:
 static struct page *ufs_get_page(struct inode *dir, unsigned long n)
 {
        struct address_space *mapping = dir->i_mapping;
-       struct page *page = read_cache_page(mapping, n,
-                               (filler_t*)mapping->a_ops->readpage, NULL);
+       struct page *page = read_mapping_page(mapping, n, NULL);
        if (!IS_ERR(page)) {
-               wait_on_page_locked(page);
                kmap(page);
-               if (!PageUptodate(page))
-                       goto fail;
                if (!PageChecked(page))
                        ufs_check_page(page);
                if (PageError(page))
@@ -317,7 +324,7 @@ int ufs_add_link(struct dentry *dentry, struct inode *inode)
        unsigned long npages = ufs_dir_pages(dir);
        unsigned long n;
        char *kaddr;
-       unsigned from, to;
+       loff_t pos;
        int err;
 
        UFSD("ENTER, name %s, namelen %u\n", name, namelen);
@@ -372,9 +379,10 @@ int ufs_add_link(struct dentry *dentry, struct inode *inode)
        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_offset(page) +
+                       (char*)de - (char*)page_address(page);
+       err = __ufs_write_begin(NULL, page->mapping, pos, rec_len,
+                               AOP_FLAG_UNINTERRUPTIBLE, &page, NULL);
        if (err)
                goto out_unlock;
        if (de->d_ino) {
@@ -391,7 +399,7 @@ got_it:
        de->d_ino = cpu_to_fs32(sb, inode->i_ino);
        ufs_set_de_type(sb, de, inode->i_mode);
 
-       err = ufs_commit_chunk(page, from, to);
+       err = ufs_commit_chunk(page, pos, rec_len);
        dir->i_mtime = dir->i_ctime = CURRENT_TIME_SEC;
 
        mark_inode_dirty(dir);
@@ -514,6 +522,7 @@ int ufs_delete_entry(struct inode *inode, struct ufs_dir_entry *dir,
        char *kaddr = page_address(page);
        unsigned from = ((char*)dir - kaddr) & ~(UFS_SB(sb)->s_uspi->s_dirblksize - 1);
        unsigned to = ((char*)dir - kaddr) + fs16_to_cpu(sb, dir->d_reclen);
+       loff_t pos;
        struct ufs_dir_entry *pde = NULL;
        struct ufs_dir_entry *de = (struct ufs_dir_entry *) (kaddr + from);
        int err;
@@ -537,13 +546,16 @@ int ufs_delete_entry(struct inode *inode, struct ufs_dir_entry *dir,
        }
        if (pde)
                from = (char*)pde - (char*)page_address(page);
+
+       pos = page_offset(page) + from;
        lock_page(page);
-       err = mapping->a_ops->prepare_write(NULL, page, from, to);
+       err = __ufs_write_begin(NULL, mapping, pos, to - from,
+                               AOP_FLAG_UNINTERRUPTIBLE, &page, NULL);
        BUG_ON(err);
        if (pde)
-               pde->d_reclen = cpu_to_fs16(sb, to-from);
+               pde->d_reclen = cpu_to_fs16(sb, to - from);
        dir->d_ino = 0;
-       err = ufs_commit_chunk(page, from, to);
+       err = ufs_commit_chunk(page, pos, to - from);
        inode->i_ctime = inode->i_mtime = CURRENT_TIME_SEC;
        mark_inode_dirty(inode);
 out:
@@ -564,14 +576,15 @@ int ufs_make_empty(struct inode * inode, struct inode *dir)
 
        if (!page)
                return -ENOMEM;
-       kmap(page);
-       err = mapping->a_ops->prepare_write(NULL, page, 0, chunk_size);
+
+       err = __ufs_write_begin(NULL, mapping, 0, chunk_size,
+                               AOP_FLAG_UNINTERRUPTIBLE, &page, NULL);
        if (err) {
                unlock_page(page);
                goto fail;
        }
 
-
+       kmap(page);
        base = (char*)page_address(page);
        memset(base, 0, PAGE_CACHE_SIZE);
 
@@ -589,10 +602,10 @@ int ufs_make_empty(struct inode * inode, struct inode *dir)
        de->d_reclen = cpu_to_fs16(sb, chunk_size - UFS_DIR_REC_LEN(1));
        ufs_set_de_namlen(sb, de, 2);
        strcpy (de->d_name, "..");
+       kunmap(page);
 
        err = ufs_commit_chunk(page, 0, chunk_size);
 fail:
-       kunmap(page);
        page_cache_release(page);
        return err;
 }