1 files changed, 5 insertions, 2 deletions

diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index 5c09776d347f..a3a404c5df2e 100644
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -1552,8 +1552,11 @@ int ext2_setattr(struct dentry *dentry, struct iattr *iattr)
         if (error)
                 return error;
 
-        if (is_quota_modification(inode, iattr))
-                dquot_initialize(inode);
+        if (is_quota_modification(inode, iattr)) {
+                error = dquot_initialize(inode);
+                if (error)
+                        return error;
+        }
         if ((iattr->ia_valid & ATTR_UID && !uid_eq(iattr->ia_uid, inode->i_uid)) ||
             (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid))) {
                 error = dquot_transfer(inode, iattr);