Merge tag 'upstream-3.7-rc1' of git://git.infradead.org/linux-ubifs

[cascardo/linux.git] / fs / ubifs / budget.c

diff --git a/fs/ubifs/budget.c b/fs/ubifs/budget.c
index ea9c814..e8e01d7 100644 (file)
--- a/fs/ubifs/budget.c
+++ b/fs/ubifs/budget.c
@@ -272,8 +272,8 @@ long long ubifs_calc_available(const struct ubifs_info *c, int min_idx_lebs)
  */
 static int can_use_rp(struct ubifs_info *c)
 {
-       if (current_fsuid() == c->rp_uid || capable(CAP_SYS_RESOURCE) ||
-           (c->rp_gid != 0 && in_group_p(c->rp_gid)))
+       if (uid_eq(current_fsuid(), c->rp_uid) || capable(CAP_SYS_RESOURCE) ||
+           (!gid_eq(c->rp_gid, GLOBAL_ROOT_GID) && in_group_p(c->rp_gid)))
                return 1;
        return 0;
 }