1 files changed, 15 insertions, 1 deletions

diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index 4acc584038ee..51cf10df83e4 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -1623,10 +1623,22 @@ static int setattr_chown(struct inode *inode, struct iattr *attr)
         if (!(attr->ia_valid & ATTR_GID) || gid_eq(ogid, ngid))
                 ogid = ngid = NO_GID_QUOTA_CHANGE;
 
-        error = gfs2_quota_lock(ip, nuid, ngid);
+        error = get_write_access(inode);
         if (error)
                 return error;
 
+        error = gfs2_rs_alloc(ip);
+        if (error)
+                goto out;
+
+        error = gfs2_rindex_update(sdp);
+        if (error)
+                goto out;
+
+        error = gfs2_quota_lock(ip, nuid, ngid);
+        if (error)
+                goto out;
+
         if (!uid_eq(ouid, NO_UID_QUOTA_CHANGE) ||
             !gid_eq(ogid, NO_GID_QUOTA_CHANGE)) {
                 error = gfs2_quota_check(ip, nuid, ngid);
@@ -1653,6 +1665,8 @@ out_end_trans:
         gfs2_trans_end(sdp);
 out_gunlock_q:
         gfs2_quota_unlock(ip);
+out:
+        put_write_access(inode);
         return error;
 }