1 files changed, 10 insertions, 22 deletions

diff --git a/fs/buffer.c b/fs/buffer.c
index 9196f2a270da..161be58c5cb0 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -49,7 +49,6 @@
 
 static int fsync_buffers_list(spinlock_t *lock, struct list_head *list);
 static int submit_bh_wbc(int op, int op_flags, struct buffer_head *bh,
-                         unsigned long bio_flags,
                          struct writeback_control *wbc);
 
 #define BH_ENTRY(list) list_entry((list), struct buffer_head, b_assoc_buffers)
@@ -1830,7 +1829,7 @@ int __block_write_full_page(struct inode *inode, struct page *page,
         do {
                 struct buffer_head *next = bh->b_this_page;
                 if (buffer_async_write(bh)) {
-                        submit_bh_wbc(REQ_OP_WRITE, write_flags, bh, 0, wbc);
+                        submit_bh_wbc(REQ_OP_WRITE, write_flags, bh, wbc);
                         nr_underway++;
                 }
                 bh = next;
@@ -1884,7 +1883,7 @@ recover:
                 struct buffer_head *next = bh->b_this_page;
                 if (buffer_async_write(bh)) {
                         clear_buffer_dirty(bh);
-                        submit_bh_wbc(REQ_OP_WRITE, write_flags, bh, 0, wbc);
+                        submit_bh_wbc(REQ_OP_WRITE, write_flags, bh, wbc);
                         nr_underway++;
                 }
                 bh = next;
@@ -2379,8 +2378,7 @@ int generic_cont_expand_simple(struct inode *inode, loff_t size)
                 goto out;
 
         err = pagecache_write_begin(NULL, mapping, size, 0,
-                                AOP_FLAG_UNINTERRUPTIBLE|AOP_FLAG_CONT_EXPAND,
-                                &page, &fsdata);
+                                    AOP_FLAG_CONT_EXPAND, &page, &fsdata);
         if (err)
                 goto out;
 
@@ -2415,9 +2413,8 @@ static int cont_expand_zero(struct file *file, struct address_space *mapping,
                 }
                 len = PAGE_SIZE - zerofrom;
 
-                err = pagecache_write_begin(file, mapping, curpos, len,
-                                                AOP_FLAG_UNINTERRUPTIBLE,
-                                                &page, &fsdata);
+                err = pagecache_write_begin(file, mapping, curpos, len, 0,
+                                            &page, &fsdata);
                 if (err)
                         goto out;
                 zero_user(page, zerofrom, len);
@@ -2449,9 +2446,8 @@ static int cont_expand_zero(struct file *file, struct address_space *mapping,
                 }
                 len = offset - zerofrom;
 
-                err = pagecache_write_begin(file, mapping, curpos, len,
-                                                AOP_FLAG_UNINTERRUPTIBLE,
-                                                &page, &fsdata);
+                err = pagecache_write_begin(file, mapping, curpos, len, 0,
+                                            &page, &fsdata);
                 if (err)
                         goto out;
                 zero_user(page, zerofrom, len);
@@ -3095,7 +3091,7 @@ void guard_bio_eod(int op, struct bio *bio)
 }
 
 static int submit_bh_wbc(int op, int op_flags, struct buffer_head *bh,
-                         unsigned long bio_flags, struct writeback_control *wbc)
+                         struct writeback_control *wbc)
 {
         struct bio *bio;
 
@@ -3130,7 +3126,6 @@ static int submit_bh_wbc(int op, int op_flags, struct buffer_head *bh,
 
         bio->bi_end_io = end_bio_bh_io_sync;
         bio->bi_private = bh;
-        bio->bi_flags |= bio_flags;
 
         /* Take care of bh's that straddle the end of the device */
         guard_bio_eod(op, bio);
@@ -3145,16 +3140,9 @@ static int submit_bh_wbc(int op, int op_flags, struct buffer_head *bh,
         return 0;
 }
 
-int _submit_bh(int op, int op_flags, struct buffer_head *bh,
-               unsigned long bio_flags)
+int submit_bh(int op, int op_flags, struct buffer_head *bh)
 {
-        return submit_bh_wbc(op, op_flags, bh, bio_flags, NULL);
-}
-EXPORT_SYMBOL_GPL(_submit_bh);
-
-int submit_bh(int op, int op_flags,  struct buffer_head *bh)
-{
-        return submit_bh_wbc(op, op_flags, bh, 0, NULL);
+        return submit_bh_wbc(op, op_flags, bh, NULL);
 }
 EXPORT_SYMBOL(submit_bh);