5 files changed, 18 insertions, 14 deletions

diff --git a/fs/configfs/inode.c b/fs/configfs/inode.c
index ddc003a9d214..dbd257d956c4 100644
--- a/fs/configfs/inode.c
+++ b/fs/configfs/inode.c
@@ -41,8 +41,8 @@ extern struct super_block * configfs_sb;
 
 static const struct address_space_operations configfs_aops = {
         .readpage       = simple_readpage,
-        .prepare_write  = simple_prepare_write,
-        .commit_write   = simple_commit_write
+        .write_begin    = simple_write_begin,
+        .write_end      = simple_write_end,
 };
 
 static struct backing_dev_info configfs_backing_dev_info = {
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index 950c2fbb815b..70fbb29fb202 100644
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -189,15 +189,19 @@ static int hugetlbfs_readpage(struct file *file, struct page * page)
         return -EINVAL;
 }
 
-static int hugetlbfs_prepare_write(struct file *file,
-                        struct page *page, unsigned offset, unsigned to)
+static int hugetlbfs_write_begin(struct file *file,
+                        struct address_space *mapping,
+                        loff_t pos, unsigned len, unsigned flags,
+                        struct page **pagep, void **fsdata)
 {
         return -EINVAL;
 }
 
-static int hugetlbfs_commit_write(struct file *file,
-                        struct page *page, unsigned offset, unsigned to)
+static int hugetlbfs_write_end(struct file *file, struct address_space *mapping,
+                        loff_t pos, unsigned len, unsigned copied,
+                        struct page *page, void *fsdata)
 {
+        BUG();
         return -EINVAL;
 }
 
@@ -569,8 +573,8 @@ static void hugetlbfs_destroy_inode(struct inode *inode)
 
 static const struct address_space_operations hugetlbfs_aops = {
         .readpage       = hugetlbfs_readpage,
-        .prepare_write  = hugetlbfs_prepare_write,
-        .commit_write   = hugetlbfs_commit_write,
+        .write_begin    = hugetlbfs_write_begin,
+        .write_end      = hugetlbfs_write_end,
         .set_page_dirty = hugetlbfs_set_page_dirty,
 };
 
diff --git a/fs/ramfs/file-mmu.c b/fs/ramfs/file-mmu.c
index 97bdc0b2f9d2..b41a514b0976 100644
--- a/fs/ramfs/file-mmu.c
+++ b/fs/ramfs/file-mmu.c
@@ -29,8 +29,8 @@
 
 const struct address_space_operations ramfs_aops = {
         .readpage       = simple_readpage,
-        .prepare_write  = simple_prepare_write,
-        .commit_write   = simple_commit_write,
+        .write_begin    = simple_write_begin,
+        .write_end      = simple_write_end,
         .set_page_dirty = __set_page_dirty_no_writeback,
 };
 
diff --git a/fs/ramfs/file-nommu.c b/fs/ramfs/file-nommu.c
index 237fe8b8e819..0989bc2c2f69 100644
--- a/fs/ramfs/file-nommu.c
+++ b/fs/ramfs/file-nommu.c
@@ -29,8 +29,8 @@ static int ramfs_nommu_setattr(struct dentry *, struct iattr *);
 
 const struct address_space_operations ramfs_aops = {
         .readpage               = simple_readpage,
-        .prepare_write          = simple_prepare_write,
-        .commit_write           = simple_commit_write,
+        .write_begin            = simple_write_begin,
+        .write_end              = simple_write_end,
         .set_page_dirty         = __set_page_dirty_no_writeback,
 };
 
diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c
index 9236635111f4..c4ef945d39c8 100644
--- a/fs/sysfs/inode.c
+++ b/fs/sysfs/inode.c
@@ -24,8 +24,8 @@ extern struct super_block * sysfs_sb;
 
 static const struct address_space_operations sysfs_aops = {
         .readpage       = simple_readpage,
-        .prepare_write  = simple_prepare_write,
-        .commit_write   = simple_commit_write
+        .write_begin    = simple_write_begin,
+        .write_end      = simple_write_end,
 };
 
 static struct backing_dev_info sysfs_backing_dev_info = {