summaryrefslogtreecommitdiff
path: root/fs/ext2
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ext2')
-rw-r--r--fs/ext2/balloc.c2
-rw-r--r--fs/ext2/super.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
index 2bac6dcb1792..007eee794bd1 100644
--- a/fs/ext2/balloc.c
+++ b/fs/ext2/balloc.c
@@ -419,7 +419,7 @@ void ext2_init_block_alloc_info(struct inode *inode)
struct ext2_block_alloc_info *block_i;
struct super_block *sb = inode->i_sb;
- block_i = kmalloc_obj(*block_i, GFP_KERNEL);
+ block_i = kmalloc_obj(*block_i);
if (block_i) {
struct ext2_reserve_window_node *rsv = &block_i->rsv_window_node;
diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index 9bb4c63f5628..b20a6eb6822b 100644
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -893,12 +893,12 @@ static int ext2_fill_super(struct super_block *sb, struct fs_context *fc)
__le32 features;
int err;
- sbi = kzalloc_obj(*sbi, GFP_KERNEL);
+ sbi = kzalloc_obj(*sbi);
if (!sbi)
return -ENOMEM;
sbi->s_blockgroup_lock =
- kzalloc_obj(struct blockgroup_lock, GFP_KERNEL);
+ kzalloc_obj(struct blockgroup_lock);
if (!sbi->s_blockgroup_lock) {
kfree(sbi);
return -ENOMEM;
@@ -1669,7 +1669,7 @@ static int ext2_init_fs_context(struct fs_context *fc)
{
struct ext2_fs_context *ctx;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;