1 files changed, 13 insertions, 5 deletions

diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
index 9e8d8ffb063f..8dcaea69e37f 100644
--- a/fs/ext4/balloc.c
+++ b/fs/ext4/balloc.c
@@ -499,20 +499,22 @@ ext4_read_block_bitmap(struct super_block *sb, ext4_group_t block_group)
 static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
                                   s64 nclusters, unsigned int flags)
 {
-        s64 free_clusters, dirty_clusters, root_clusters;
+        s64 free_clusters, dirty_clusters, rsv, resv_clusters;
         struct percpu_counter *fcc = &sbi->s_freeclusters_counter;
         struct percpu_counter *dcc = &sbi->s_dirtyclusters_counter;
 
         free_clusters  = percpu_counter_read_positive(fcc);
         dirty_clusters = percpu_counter_read_positive(dcc);
+        resv_clusters = atomic64_read(&sbi->s_resv_clusters);
 
         /*
          * r_blocks_count should always be multiple of the cluster ratio so
          * we are safe to do a plane bit shift only.
          */
-        root_clusters = ext4_r_blocks_count(sbi->s_es) >> sbi->s_cluster_bits;
+        rsv = (ext4_r_blocks_count(sbi->s_es) >> sbi->s_cluster_bits) +
+              resv_clusters;
 
-        if (free_clusters - (nclusters + root_clusters + dirty_clusters) <
+        if (free_clusters - (nclusters + rsv + dirty_clusters) <
                                         EXT4_FREECLUSTERS_WATERMARK) {
                 free_clusters  = percpu_counter_sum_positive(fcc);
                 dirty_clusters = percpu_counter_sum_positive(dcc);
@@ -520,15 +522,21 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
         /* Check whether we have space after accounting for current
          * dirty clusters & root reserved clusters.
          */
-        if (free_clusters >= ((root_clusters + nclusters) + dirty_clusters))
+        if (free_clusters >= (rsv + nclusters + dirty_clusters))
                 return 1;
 
         /* Hm, nope.  Are (enough) root reserved clusters available? */
         if (uid_eq(sbi->s_resuid, current_fsuid()) ||
             (!gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) && in_group_p(sbi->s_resgid)) ||
             capable(CAP_SYS_RESOURCE) ||
-                (flags & EXT4_MB_USE_ROOT_BLOCKS)) {
+            (flags & EXT4_MB_USE_ROOT_BLOCKS)) {
 
+                if (free_clusters >= (nclusters + dirty_clusters +
+                                      resv_clusters))
+                        return 1;
+        }
+        /* No free blocks. Let's see if we can dip into reserved pool */
+        if (flags & EXT4_MB_USE_RESERVED) {
                 if (free_clusters >= (nclusters + dirty_clusters))
                         return 1;
         }