6 files changed, 32 insertions, 50 deletions

diff --git a/fs/xfs/linux-2.6/kmem.h b/fs/xfs/linux-2.6/kmem.h
index e6ea293f303c..5e9564902976 100644
--- a/fs/xfs/linux-2.6/kmem.h
+++ b/fs/xfs/linux-2.6/kmem.h
@@ -79,7 +79,7 @@ kmem_zone_init(int size, char *zone_name)
 
 static inline kmem_zone_t *
 kmem_zone_init_flags(int size, char *zone_name, unsigned long flags,
-                     void (*construct)(void *, kmem_zone_t *, unsigned long))
+                     void (*construct)(kmem_zone_t *, void *))
 {
         return kmem_cache_create(zone_name, size, 0, flags, construct);
 }
diff --git a/fs/xfs/linux-2.6/xfs_aops.c b/fs/xfs/linux-2.6/xfs_aops.c
index a252fa72f55b..2e34b104107c 100644
--- a/fs/xfs/linux-2.6/xfs_aops.c
+++ b/fs/xfs/linux-2.6/xfs_aops.c
@@ -323,17 +323,13 @@ xfs_iomap_valid(
 /*
  * BIO completion handler for buffered IO.
  */
-STATIC int
+STATIC void
 xfs_end_bio(
         struct bio              *bio,
-        unsigned int            bytes_done,
         int                     error)
 {
         xfs_ioend_t             *ioend = bio->bi_private;
 
-        if (bio->bi_size)
-                return 1;
-
         ASSERT(atomic_read(&bio->bi_cnt) >= 1);
         ioend->io_error = test_bit(BIO_UPTODATE, &bio->bi_flags) ? 0 : error;
 
@@ -343,7 +339,6 @@ xfs_end_bio(
         bio_put(bio);
 
         xfs_finish_ioend(ioend, 0);
-        return 0;
 }
 
 STATIC void
@@ -407,10 +402,9 @@ xfs_start_page_writeback(
                 clear_page_dirty_for_io(page);
         set_page_writeback(page);
         unlock_page(page);
-        if (!buffers) {
+        /* If no buffers on the page are to be written, finish it here */
+        if (!buffers)
                 end_page_writeback(page);
-                wbc->pages_skipped++;   /* We didn't write this page */
-        }
 }
 
 static inline int bio_add_buffer(struct bio *bio, struct buffer_head *bh)
@@ -1509,13 +1503,18 @@ xfs_vm_direct_IO(
 }
 
 STATIC int
-xfs_vm_prepare_write(
+xfs_vm_write_begin(
         struct file             *file,
-        struct page             *page,
-        unsigned int            from,
-        unsigned int            to)
+        struct address_space    *mapping,
+        loff_t                  pos,
+        unsigned                len,
+        unsigned                flags,
+        struct page             **pagep,
+        void                    **fsdata)
 {
-        return block_prepare_write(page, from, to, xfs_get_blocks);
+        *pagep = NULL;
+        return block_write_begin(file, mapping, pos, len, flags, pagep, fsdata,
+                                                                xfs_get_blocks);
 }
 
 STATIC sector_t
@@ -1570,8 +1569,8 @@ const struct address_space_operations xfs_address_space_operations = {
         .sync_page              = block_sync_page,
         .releasepage            = xfs_vm_releasepage,
         .invalidatepage         = xfs_vm_invalidatepage,
-        .prepare_write          = xfs_vm_prepare_write,
-        .commit_write           = generic_commit_write,
+        .write_begin            = xfs_vm_write_begin,
+        .write_end              = generic_write_end,
         .bmap                   = xfs_vm_bmap,
         .direct_IO              = xfs_vm_direct_IO,
         .migratepage            = buffer_migrate_page,
diff --git a/fs/xfs/linux-2.6/xfs_buf.c b/fs/xfs/linux-2.6/xfs_buf.c
index d5b2d2bbf5ff..b9c8589e05c2 100644
--- a/fs/xfs/linux-2.6/xfs_buf.c
+++ b/fs/xfs/linux-2.6/xfs_buf.c
@@ -1127,19 +1127,15 @@ _xfs_buf_ioend(
         }
 }
 
-STATIC int
+STATIC void
 xfs_buf_bio_end_io(
         struct bio              *bio,
-        unsigned int            bytes_done,
         int                     error)
 {
         xfs_buf_t               *bp = (xfs_buf_t *)bio->bi_private;
         unsigned int            blocksize = bp->b_target->bt_bsize;
         struct bio_vec          *bvec = bio->bi_io_vec + bio->bi_vcnt - 1;
 
-        if (bio->bi_size)
-                return 1;
-
         if (!test_bit(BIO_UPTODATE, &bio->bi_flags))
                 bp->b_error = EIO;
 
@@ -1167,7 +1163,6 @@ xfs_buf_bio_end_io(
 
         _xfs_buf_ioend(bp, 1);
         bio_put(bio);
-        return 0;
 }
 
 STATIC void
diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c
index 11edd72baac7..ac50f8a37582 100644
--- a/fs/xfs/linux-2.6/xfs_iops.c
+++ b/fs/xfs/linux-2.6/xfs_iops.c
@@ -117,7 +117,7 @@ xfs_ichgtime(
          */
         SYNCHRONIZE();
         ip->i_update_core = 1;
-        if (!(inode->i_state & I_LOCK))
+        if (!(inode->i_state & I_SYNC))
                 mark_inode_dirty_sync(inode);
 }
 
@@ -169,7 +169,7 @@ xfs_ichgtime_fast(
          */
         SYNCHRONIZE();
         ip->i_update_core = 1;
-        if (!(inode->i_state & I_LOCK))
+        if (!(inode->i_state & I_SYNC))
                 mark_inode_dirty_sync(inode);
 }
 
diff --git a/fs/xfs/linux-2.6/xfs_lrw.c b/fs/xfs/linux-2.6/xfs_lrw.c
index 0f54b104a6ee..d6a8dddb2268 100644
--- a/fs/xfs/linux-2.6/xfs_lrw.c
+++ b/fs/xfs/linux-2.6/xfs_lrw.c
@@ -135,45 +135,34 @@ xfs_iozero(
         loff_t                  pos,    /* offset in file               */
         size_t                  count)  /* size of data to zero         */
 {
-        unsigned                bytes;
         struct page             *page;
         struct address_space    *mapping;
         int                     status;
 
         mapping = ip->i_mapping;
         do {
-                unsigned long index, offset;
+                unsigned offset, bytes;
+                void *fsdata;
 
                 offset = (pos & (PAGE_CACHE_SIZE -1)); /* Within page */
-                index = pos >> PAGE_CACHE_SHIFT;
                 bytes = PAGE_CACHE_SIZE - offset;
                 if (bytes > count)
                         bytes = count;
 
-                status = -ENOMEM;
-                page = grab_cache_page(mapping, index);
-                if (!page)
-                        break;
-
-                status = mapping->a_ops->prepare_write(NULL, page, offset,
-                                                        offset + bytes);
+                status = pagecache_write_begin(NULL, mapping, pos, bytes,
+                                        AOP_FLAG_UNINTERRUPTIBLE,
+                                        &page, &fsdata);
                 if (status)
-                        goto unlock;
+                        break;
 
                 zero_user_page(page, offset, bytes, KM_USER0);
 
-                status = mapping->a_ops->commit_write(NULL, page, offset,
-                                                        offset + bytes);
-                if (!status) {
-                        pos += bytes;
-                        count -= bytes;
-                }
-
-unlock:
-                unlock_page(page);
-                page_cache_release(page);
-                if (status)
-                        break;
+                status = pagecache_write_end(NULL, mapping, pos, bytes, bytes,
+                                        page, fsdata);
+                WARN_ON(status <= 0); /* can't return less than zero! */
+                pos += bytes;
+                count -= bytes;
+                status = 0;
         } while (count);
 
         return (-status);
diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c
index f90485828584..8cb63c60c048 100644
--- a/fs/xfs/linux-2.6/xfs_super.c
+++ b/fs/xfs/linux-2.6/xfs_super.c
@@ -355,9 +355,8 @@ xfs_fs_destroy_inode(
 
 STATIC void
 xfs_fs_inode_init_once(
-        void                    *vnode,
         kmem_zone_t             *zonep,
-        unsigned long           flags)
+        void                    *vnode)
 {
         inode_init_once(vn_to_inode((bhv_vnode_t *)vnode));
 }