1 files changed, 8 insertions, 2 deletions

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index d2b60ed6c33f..fc97b00bd871 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1167,6 +1167,8 @@ static noinline ssize_t __btrfs_buffered_write(struct file *file,
         nrptrs = min((iov_iter_count(i) + PAGE_CACHE_SIZE - 1) /
                      PAGE_CACHE_SIZE, PAGE_CACHE_SIZE /
                      (sizeof(struct page *)));
+        nrptrs = min(nrptrs, current->nr_dirtied_pause - current->nr_dirtied);
+        nrptrs = max(nrptrs, 8);
         pages = kmalloc(nrptrs * sizeof(struct page *), GFP_KERNEL);
         if (!pages)
                 return -ENOMEM;
@@ -1387,7 +1389,11 @@ static ssize_t btrfs_file_aio_write(struct kiocb *iocb,
                 goto out;
         }
 
-        file_update_time(file);
+        err = btrfs_update_time(file);
+        if (err) {
+                mutex_unlock(&inode->i_mutex);
+                goto out;
+        }
         BTRFS_I(inode)->sequence++;
 
         start_pos = round_down(pos, root->sectorsize);
@@ -1832,7 +1838,7 @@ static loff_t btrfs_file_llseek(struct file *file, loff_t offset, int origin)
         switch (origin) {
         case SEEK_END:
         case SEEK_CUR:
-                offset = generic_file_llseek_unlocked(file, offset, origin);
+                offset = generic_file_llseek(file, offset, origin);
                 goto out;
         case SEEK_DATA:
         case SEEK_HOLE: