Merge branch 'next' into for-linus

[linux-2.6-omap-h63xx.git] / fs / ext4 / balloc.c

diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
index db35cfdb3c8b6e25424a78af0aaaa69579cc2a07..38b3acf5683b2da37ac2ce639d9faea2ce4366df 100644 (file)
--- a/fs/ext4/balloc.c
+++ b/fs/ext4/balloc.c
@@ -624,7 +624,7 @@ int ext4_has_free_blocks(struct ext4_sb_info *sbi, s64 nblocks)
                return 1;
 
        /* Hm, nope.  Are (enough) root reserved blocks available? */
-       if (sbi->s_resuid == current->fsuid ||
+       if (sbi->s_resuid == current_fsuid() ||
            ((sbi->s_resgid != 0) && in_group_p(sbi->s_resgid)) ||
            capable(CAP_SYS_RESOURCE)) {
                if (free_blocks >= (nblocks + dirty_blocks))