Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[firefly-linux-kernel-4.4.55.git] / fs / ext4 / balloc.c

diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
index 5745d53c67e8380c8bcfcb726b663c03d8eeea0b..99b6324290db916466d8b5c0633e9fa216d21798 100644 (file)
--- a/fs/ext4/balloc.c
+++ b/fs/ext4/balloc.c
@@ -486,8 +486,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
                return 1;
 
        /* Hm, nope.  Are (enough) root reserved clusters available? */
-       if (sbi->s_resuid == current_fsuid() ||
-           ((sbi->s_resgid != 0) && in_group_p(sbi->s_resgid)) ||
+       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)) {