net: dsa: change scope of bridging code

[karo-tx-linux.git] / fs / buffer.c

diff --git a/fs/buffer.c b/fs/buffer.c
index 68dc05ce06a510b1d7286a2b059a534b88650fd3..161be58c5cb0f738754b79d87eda879aa3bb9553 100644 (file)
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -2378,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;
 
@@ -2414,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);
@@ -2448,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);