Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[karo-tx-linux.git] / fs / super.c

diff --git a/fs/super.c b/fs/super.c
index 6f8c954315c0299ccd41f6d7b1367461b9d9ed67..eae088f6aaaeb6e8a3380adad19fb66feebe9905 100644 (file)
--- a/fs/super.c
+++ b/fs/super.c
@@ -177,7 +177,8 @@ static struct super_block *alloc_super(struct file_system_type *type, int flags)
                goto fail;
 
        for (i = 0; i < SB_FREEZE_LEVELS; i++) {
-               if (percpu_counter_init(&s->s_writers.counter[i], 0) < 0)
+               if (percpu_counter_init(&s->s_writers.counter[i], 0,
+                                       GFP_KERNEL) < 0)
                        goto fail;
                lockdep_init_map(&s->s_writers.lock_map[i], sb_writers_name[i],
                                 &type->s_writers_key[i], 0);