summaryrefslogtreecommitdiffstats
path: root/fs/ext4/inode.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/inode.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/inode.c')
-rw-r--r--fs/ext4/inode.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index cecf9aa10811..fed7ee7ea6e8 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -4661,8 +4661,11 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr)
4661 if (error) 4661 if (error)
4662 return error; 4662 return error;
4663 4663
4664 if (is_quota_modification(inode, attr)) 4664 if (is_quota_modification(inode, attr)) {
4665 dquot_initialize(inode); 4665 error = dquot_initialize(inode);
4666 if (error)
4667 return error;
4668 }
4666 if ((ia_valid & ATTR_UID && !uid_eq(attr->ia_uid, inode->i_uid)) || 4669 if ((ia_valid & ATTR_UID && !uid_eq(attr->ia_uid, inode->i_uid)) ||
4667 (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid))) { 4670 (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid))) {
4668 handle_t *handle; 4671 handle_t *handle;