aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext4/ialloc.c
diff options
context:
space:
mode:
authorJan Kara <jack@suse.com>2015-06-29 10:22:54 -0400
committerJan Kara <jack@suse.com>2015-07-23 14:59:37 -0400
commita7cdadee0e89486ad072be7b91e477105784e0bb (patch)
tree4021b741aca2ba3cf718dbec1705c74fe7846071 /fs/ext4/ialloc.c
parentc2edb305d6846ee8af7b5133845e23943d128e4c (diff)
ext4: Handle error from dquot_initialize()
dquot_initialize() can now return error. Handle it where possible. Acked-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Jan Kara <jack@suse.com>
Diffstat (limited to 'fs/ext4/ialloc.c')
-rw-r--r--fs/ext4/ialloc.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
index 173c1ae21395..619bfc1fda8c 100644
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
@@ -721,7 +721,7 @@ struct inode *__ext4_new_inode(handle_t *handle, struct inode *dir,
721 struct ext4_group_desc *gdp = NULL; 721 struct ext4_group_desc *gdp = NULL;
722 struct ext4_inode_info *ei; 722 struct ext4_inode_info *ei;
723 struct ext4_sb_info *sbi; 723 struct ext4_sb_info *sbi;
724 int ret2, err = 0; 724 int ret2, err;
725 struct inode *ret; 725 struct inode *ret;
726 ext4_group_t i; 726 ext4_group_t i;
727 ext4_group_t flex_group; 727 ext4_group_t flex_group;
@@ -769,7 +769,9 @@ struct inode *__ext4_new_inode(handle_t *handle, struct inode *dir,
769 inode->i_gid = dir->i_gid; 769 inode->i_gid = dir->i_gid;
770 } else 770 } else
771 inode_init_owner(inode, dir, mode); 771 inode_init_owner(inode, dir, mode);
772 dquot_initialize(inode); 772 err = dquot_initialize(inode);
773 if (err)
774 goto out;
773 775
774 if (!goal) 776 if (!goal)
775 goal = sbi->s_inode_goal; 777 goal = sbi->s_inode_goal;