1 files changed, 14 insertions, 8 deletions

diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 719f7f4c7a37..7210583b472f 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -105,8 +105,11 @@ static int ocfs2_file_open(struct inode *inode, struct file *file)
                               file->f_path.dentry->d_name.len,
                               file->f_path.dentry->d_name.name, mode);
 
-        if (file->f_mode & FMODE_WRITE)
-                dquot_initialize(inode);
+        if (file->f_mode & FMODE_WRITE) {
+                status = dquot_initialize(inode);
+                if (status)
+                        goto leave;
+        }
 
         spin_lock(&oi->ip_lock);
 
@@ -1155,8 +1158,11 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr)
         if (status)
                 return status;
 
-        if (is_quota_modification(inode, attr))
-                dquot_initialize(inode);
+        if (is_quota_modification(inode, attr)) {
+                status = dquot_initialize(inode);
+                if (status)
+                        return status;
+        }
         size_change = S_ISREG(inode->i_mode) && attr->ia_valid & ATTR_SIZE;
         if (size_change) {
                 status = ocfs2_rw_lock(inode, 1);
@@ -1209,8 +1215,8 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr)
                     && OCFS2_HAS_RO_COMPAT_FEATURE(sb,
                     OCFS2_FEATURE_RO_COMPAT_USRQUOTA)) {
                         transfer_to[USRQUOTA] = dqget(sb, make_kqid_uid(attr->ia_uid));
-                        if (!transfer_to[USRQUOTA]) {
-                                status = -ESRCH;
+                        if (IS_ERR(transfer_to[USRQUOTA])) {
+                                status = PTR_ERR(transfer_to[USRQUOTA]);
                                 goto bail_unlock;
                         }
                 }
@@ -1218,8 +1224,8 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr)
                     && OCFS2_HAS_RO_COMPAT_FEATURE(sb,
                     OCFS2_FEATURE_RO_COMPAT_GRPQUOTA)) {
                         transfer_to[GRPQUOTA] = dqget(sb, make_kqid_gid(attr->ia_gid));
-                        if (!transfer_to[GRPQUOTA]) {
-                                status = -ESRCH;
+                        if (IS_ERR(transfer_to[GRPQUOTA])) {
+                                status = PTR_ERR(transfer_to[GRPQUOTA]);
                                 goto bail_unlock;
                         }
                 }