Merge branch 'fix/misc' into for-linus

[safe/jmp/linux-2.6] / fs / sysv / dir.c

diff --git a/fs/sysv/dir.c b/fs/sysv/dir.c
index ebf7007..1dabed2 100644 (file)
--- a/fs/sysv/dir.c
+++ b/fs/sysv/dir.c
@@ -15,15 +15,16 @@
 
 #include <linux/pagemap.h>
 #include <linux/highmem.h>
-#include <linux/smp_lock.h>
+#include <linux/swap.h>
 #include "sysv.h"
 
 static int sysv_readdir(struct file *, void *, filldir_t);
 
 const struct file_operations sysv_dir_operations = {
+       .llseek         = generic_file_llseek,
        .read           = generic_read_dir,
        .readdir        = sysv_readdir,
-       .fsync          = sysv_sync_file,
+       .fsync          = simple_fsync,
 };
 
 static inline void dir_put_page(struct page *page)
@@ -37,12 +38,17 @@ static inline unsigned long dir_pages(struct inode *inode)
        return (inode->i_size+PAGE_CACHE_SIZE-1)>>PAGE_CACHE_SHIFT;
 }
 
-static int dir_commit_chunk(struct page *page, unsigned from, unsigned to)
+static int dir_commit_chunk(struct page *page, loff_t pos, unsigned len)
 {
-       struct inode *dir = (struct inode *)page->mapping->host;
+       struct address_space *mapping = page->mapping;
+       struct inode *dir = mapping->host;
        int err = 0;
 
-       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
@@ -54,17 +60,9 @@ static struct page * dir_get_page(struct inode *dir, unsigned long n)
 {
        struct address_space *mapping = dir->i_mapping;
        struct page *page = read_mapping_page(mapping, n, NULL);
-       if (!IS_ERR(page)) {
-               wait_on_page_locked(page);
+       if (!IS_ERR(page))
                kmap(page);
-               if (!PageUptodate(page))
-                       goto fail;
-       }
        return page;
-
-fail:
-       dir_put_page(page);
-       return ERR_PTR(-EIO);
 }
 
 static int sysv_readdir(struct file * filp, void * dirent, filldir_t filldir)
@@ -76,8 +74,6 @@ static int sysv_readdir(struct file * filp, void * dirent, filldir_t filldir)
        unsigned long n = pos >> PAGE_CACHE_SHIFT;
        unsigned long npages = dir_pages(inode);
 
-       lock_kernel();
-
        pos = (pos + SYSV_DIRSIZE-1) & ~(SYSV_DIRSIZE-1);
        if (pos >= inode->i_size)
                goto done;
@@ -115,7 +111,6 @@ static int sysv_readdir(struct file * filp, void * dirent, filldir_t filldir)
 
 done:
        filp->f_pos = ((loff_t)n << PAGE_CACHE_SHIFT) | offset;
-       unlock_kernel();
        return 0;
 }
 
@@ -169,8 +164,8 @@ struct sysv_dir_entry *sysv_find_entry(struct dentry *dentry, struct page **res_
                                                        name, de->name))
                                        goto found;
                        }
+                       dir_put_page(page);
                }
-               dir_put_page(page);
 
                if (++n >= npages)
                        n = 0;
@@ -194,7 +189,7 @@ int sysv_add_link(struct dentry *dentry, struct inode *inode)
        unsigned long npages = dir_pages(dir);
        unsigned long n;
        char *kaddr;
-       unsigned from, to;
+       loff_t pos;
        int err;
 
        /* We take care of directory expansion in the same loop */
@@ -220,16 +215,17 @@ int sysv_add_link(struct dentry *dentry, struct inode *inode)
        return -EINVAL;
 
 got_it:
-       from = (char*)de - (char*)page_address(page);
-       to = from + SYSV_DIRSIZE;
+       pos = page_offset(page) +
+                       (char*)de - (char*)page_address(page);
        lock_page(page);
-       err = page->mapping->a_ops->prepare_write(NULL, page, from, to);
+       err = __sysv_write_begin(NULL, page->mapping, pos, SYSV_DIRSIZE,
+                               AOP_FLAG_UNINTERRUPTIBLE, &page, NULL);
        if (err)
                goto out_unlock;
        memcpy (de->name, name, namelen);
        memset (de->name + namelen, 0, SYSV_DIRSIZE - namelen - 2);
        de->inode = cpu_to_fs16(SYSV_SB(inode->i_sb), inode->i_ino);
-       err = dir_commit_chunk(page, from, to);
+       err = dir_commit_chunk(page, pos, SYSV_DIRSIZE);
        dir->i_mtime = dir->i_ctime = CURRENT_TIME_SEC;
        mark_inode_dirty(dir);
 out_page:
@@ -246,15 +242,15 @@ 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;
        char *kaddr = (char*)page_address(page);
-       unsigned from = (char*)de - kaddr;
-       unsigned to = from + SYSV_DIRSIZE;
+       loff_t pos = page_offset(page) + (char *)de - kaddr;
        int err;
 
        lock_page(page);
-       err = mapping->a_ops->prepare_write(NULL, page, from, to);
+       err = __sysv_write_begin(NULL, mapping, pos, SYSV_DIRSIZE,
+                               AOP_FLAG_UNINTERRUPTIBLE, &page, NULL);
        BUG_ON(err);
        de->inode = 0;
-       err = dir_commit_chunk(page, from, to);
+       err = dir_commit_chunk(page, pos, SYSV_DIRSIZE);
        dir_put_page(page);
        inode->i_ctime = inode->i_mtime = CURRENT_TIME_SEC;
        mark_inode_dirty(inode);
@@ -271,12 +267,13 @@ int sysv_make_empty(struct inode *inode, struct inode *dir)
 
        if (!page)
                return -ENOMEM;
-       kmap(page);
-       err = mapping->a_ops->prepare_write(NULL, page, 0, 2 * SYSV_DIRSIZE);
+       err = __sysv_write_begin(NULL, mapping, 0, 2 * SYSV_DIRSIZE,
+                               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);
@@ -288,9 +285,9 @@ int sysv_make_empty(struct inode *inode, struct inode *dir)
        de->inode = cpu_to_fs16(SYSV_SB(inode->i_sb), dir->i_ino);
        strcpy(de->name,"..");
 
+       kunmap(page);
        err = dir_commit_chunk(page, 0, 2 * SYSV_DIRSIZE);
 fail:
-       kunmap(page);
        page_cache_release(page);
        return err;
 }
@@ -344,16 +341,18 @@ not_empty:
 void sysv_set_link(struct sysv_dir_entry *de, struct page *page,
        struct inode *inode)
 {
-       struct inode *dir = (struct inode*)page->mapping->host;
-       unsigned from = (char *)de-(char*)page_address(page);
-       unsigned to = from + SYSV_DIRSIZE;
+       struct address_space *mapping = page->mapping;
+       struct inode *dir = mapping->host;
+       loff_t pos = page_offset(page) +
+                       (char *)de-(char*)page_address(page);
        int err;
 
        lock_page(page);
-       err = page->mapping->a_ops->prepare_write(NULL, page, from, to);
+       err = __sysv_write_begin(NULL, mapping, pos, SYSV_DIRSIZE,
+                               AOP_FLAG_UNINTERRUPTIBLE, &page, NULL);
        BUG_ON(err);
        de->inode = cpu_to_fs16(SYSV_SB(inode->i_sb), inode->i_ino);
-       err = dir_commit_chunk(page, from, to);
+       err = dir_commit_chunk(page, pos, SYSV_DIRSIZE);
        dir_put_page(page);
        dir->i_mtime = dir->i_ctime = CURRENT_TIME_SEC;
        mark_inode_dirty(dir);