xfs: fix duplicate message output

[pandora-kernel.git] / fs / minix / dir.c

diff --git a/fs/minix/dir.c b/fs/minix/dir.c
index 1dbf921..085a926 100644 (file)
--- a/fs/minix/dir.c
+++ b/fs/minix/dir.c
@@ -271,8 +271,7 @@ int minix_add_link(struct dentry *dentry, struct inode *inode)
 
 got_it:
        pos = page_offset(page) + p - (char *)page_address(page);
-       err = __minix_write_begin(NULL, page->mapping, pos, sbi->s_dirsize,
-                                       AOP_FLAG_UNINTERRUPTIBLE, &page, NULL);
+       err = minix_prepare_chunk(page, pos, sbi->s_dirsize);
        if (err)
                goto out_unlock;
        memcpy (namx, name, namelen);
@@ -297,8 +296,7 @@ out_unlock:
 
 int minix_delete_entry(struct minix_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 = page_address(page);
        loff_t pos = page_offset(page) + (char*)de - kaddr;
        struct minix_sb_info *sbi = minix_sb(inode->i_sb);
@@ -306,8 +304,7 @@ int minix_delete_entry(struct minix_dir_entry *de, struct page *page)
        int err;
 
        lock_page(page);
-       err = __minix_write_begin(NULL, mapping, pos, len,
-                                       AOP_FLAG_UNINTERRUPTIBLE, &page, NULL);
+       err = minix_prepare_chunk(page, pos, len);
        if (err == 0) {
                if (sbi->s_version == MINIX_V3)
                        ((minix3_dirent *) de)->inode = 0;
@@ -325,16 +322,14 @@ int minix_delete_entry(struct minix_dir_entry *de, struct page *page)
 
 int minix_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 minix_sb_info *sbi = minix_sb(inode->i_sb);
        char *kaddr;
        int err;
 
        if (!page)
                return -ENOMEM;
-       err = __minix_write_begin(NULL, mapping, 0, 2 * sbi->s_dirsize,
-                                       AOP_FLAG_UNINTERRUPTIBLE, &page, NULL);
+       err = minix_prepare_chunk(page, 0, 2 * sbi->s_dirsize);
        if (err) {
                unlock_page(page);
                goto fail;
@@ -425,8 +420,7 @@ not_empty:
 void minix_set_link(struct minix_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;
        struct minix_sb_info *sbi = minix_sb(dir->i_sb);
        loff_t pos = page_offset(page) +
                        (char *)de-(char*)page_address(page);
@@ -434,8 +428,7 @@ void minix_set_link(struct minix_dir_entry *de, struct page *page,
 
        lock_page(page);
 
-       err = __minix_write_begin(NULL, mapping, pos, sbi->s_dirsize,
-                                       AOP_FLAG_UNINTERRUPTIBLE, &page, NULL);
+       err = minix_prepare_chunk(page, pos, sbi->s_dirsize);
        if (err == 0) {
                if (sbi->s_version == MINIX_V3)
                        ((minix3_dirent *) de)->inode = inode->i_ino;